change version to 2.0.2-Snapshot

8 files changed, 146 insertions, 21 deletions

diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index 57aa5c794..aaadb1969 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>MOA</groupId>
         <artifactId>id</artifactId>
-        <version>2.0.1</version>
+        <version>2.0.x</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>MOA.id</groupId>
     <artifactId>moa-id-configuration</artifactId>
-    <version>1.0.1</version>
+    <version>${configtool-version}</version>
     <packaging>war</packaging>
     <name>MOA-ID 2.0 Configuration Tool</name>
     <description>Web based Configuration Tool for MOA-ID 2.x</description>
@@ -73,7 +73,6 @@
         <dependency>
             <groupId>MOA.id.server</groupId>
             <artifactId>moa-id-lib</artifactId>
-            <!-- <version>1.9.98-SNAPSHOT</version> -->
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -142,20 +141,42 @@
     </dependencies>
 
 		<build>
+			<pluginManagement>
 			<plugins>
-				<plugin>
+			
+			       	<plugin>
+            		<groupId>org.codehaus.mojo</groupId>
+            		<artifactId>properties-maven-plugin</artifactId>
+            		<version>1.0-alpha-2</version>
+            		<executions>
+                		<execution>
+                    		<phase>initialize</phase>
+                    		<goals>
+                        		<goal>read-project-properties</goal>
+                    		</goals>
+                    		<configuration>
+    	                   		<files>
+		                            <file>${basedir}/moa-id.properties</file>
+      		                  </files>
+          		          </configuration>
+              		  </execution>
+            		</executions>
+        		</plugin>
+			
+					<plugin>
      			<groupId>org.apache.maven.plugins</groupId>
      			<artifactId>maven-war-plugin</artifactId>
      			<version>2.4</version>
      			<configuration>
          		<archive>
              <manifestEntries>
-                 <version>${project.version}</version>
+                 <version>${configtool-version}</version>
              </manifestEntries>
-        	 </archive>
-    		 </configuration>
-</plugin>
-			</plugins>
+        	 	</archive>
+    		 	</configuration>
+					</plugin>
+				</plugins>
+			</pluginManagement>
 		</build>
 
 </project>
diff --git a/id/oa/pom.xml b/id/oa/pom.xml
index b88f560fb..63533c0bc 100644
--- a/id/oa/pom.xml
+++ b/id/oa/pom.xml
@@ -4,14 +4,14 @@
     <parent>
   		<groupId>MOA</groupId>
     	<artifactId>id</artifactId>
-    	<version>2.0.1</version>
+    	<version>2.0.x</version>
   	</parent>
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>MOA.id</groupId>
     <artifactId>moa-id-oa</artifactId>
     <packaging>war</packaging>
-    <version>2.0.1</version>
+    <version>${demo-oa-version}</version>
     <name>MOA Sample OA</name>
 
     <properties>
@@ -33,7 +33,26 @@
     
     <build>
         <finalName>oa</finalName>
+        <pluginManagement>
         <plugins>
+        		  <plugin>
+            		<groupId>org.codehaus.mojo</groupId>
+            		<artifactId>properties-maven-plugin</artifactId>
+            		<version>1.0-alpha-2</version>
+            		<executions>
+                		<execution>
+                    		<phase>initialize</phase>
+                    		<goals>
+                        		<goal>read-project-properties</goal>
+                    		</goals>
+                    		<configuration>
+    	                   		<files>
+		                            <file>${basedir}/moa-id.properties</file>
+      		                  </files>
+          		          </configuration>
+              		  </execution>
+            		</executions>
+        		</plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -43,6 +62,7 @@
                 </configuration>
             </plugin>
         </plugins>
+        </pluginManagement>
     </build>
     
     <dependencies>
diff --git a/id/pom.xml b/id/pom.xml
index 7bf09edfa..18631a8d1 100644
--- a/id/pom.xml
+++ b/id/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>MOA</groupId>
         <artifactId>MOA</artifactId>
-        <version>2.0.1</version>
+        <version>2.0.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>id</artifactId>
+    <version>2.0.x</version>
     <packaging>pom</packaging>
-    <version>2.0.1</version>
     <name>MOA ID</name>
 
     <modules>
@@ -25,7 +25,27 @@
     </properties>
 
     <build>
+    <pluginManagement>
         <plugins>
+			       	<plugin>
+            		<groupId>org.codehaus.mojo</groupId>
+            		<artifactId>properties-maven-plugin</artifactId>
+            		<version>1.0-alpha-2</version>
+            		<executions>
+                		<execution>
+                    		<phase>initialize</phase>
+                    		<goals>
+                        		<goal>read-project-properties</goal>
+                    		</goals>
+                    		<configuration>
+    	                   		<files>
+		                            <file>${basedir}/moa-id.properties</file>
+      		                  </files>
+          		          </configuration>
+              		  </execution>
+            		</executions>
+        		</plugin>
+        
             <plugin>
                 <artifactId>maven-enforcer-plugin</artifactId>
                 <version>1.1.1</version>
@@ -59,6 +79,7 @@
                 </executions>
             </plugin>
         </plugins>
+        </pluginManagement>
     </build>
 
 </project>
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 618429a8e..72da9ea47 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -2,12 +2,13 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>2.0.1</version>
+		<version>2.0.x</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-auth</artifactId>
+	<version>${moa-id-version}</version>
 	<packaging>war</packaging>
 	<name>MOA ID-Auth WebService</name>
 	
@@ -26,7 +27,27 @@
 	<build>
 		<!--sourceDirectory>${basedir}/../idserverlib/src/main/java</sourceDirectory-->
 		<!--testSourceDirectory>${basedir}/../idserverlib/src/test/java</testSourceDirectory-->
+		<pluginManagement>
 		<plugins>
+		
+		        	<plugin>
+            		<groupId>org.codehaus.mojo</groupId>
+            		<artifactId>properties-maven-plugin</artifactId>
+            		<version>1.0-alpha-2</version>
+            		<executions>
+                		<execution>
+                    		<phase>initialize</phase>
+                    		<goals>
+                        		<goal>read-project-properties</goal>
+                    		</goals>
+                    		<configuration>
+    	                   		<files>
+		                            <file>moa-id.properties</file>
+      		                  </files>
+          		          </configuration>
+              		  </execution>
+            		</executions>
+        		</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
@@ -58,6 +79,7 @@
 				</configuration>
 			</plugin>
 		</plugins>
+		</pluginManagement>
 	</build>
 	
 	<dependencies>
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 285a5da9c..5ce26814a 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -3,12 +3,13 @@
 	<parent>

 		<groupId>MOA.id</groupId>

 		<artifactId>moa-id</artifactId>

-		<version>2.0.1</version>

+		<version>2.0.x</version>

 	</parent>

 

 	<modelVersion>4.0.0</modelVersion>

 	<groupId>MOA.id.server</groupId>

 	<artifactId>moa-id-lib</artifactId>

+	<version>${moa-id-version}</version>

 	<packaging>jar</packaging>

 	<name>MOA ID API</name>

 

@@ -270,7 +271,26 @@
 	</dependencies>

 

 	<build>

+	<pluginManagement>

 		<plugins>

+		        		<plugin>

+            		<groupId>org.codehaus.mojo</groupId>

+            		<artifactId>properties-maven-plugin</artifactId>

+            		<version>1.0-alpha-2</version>

+            		<executions>

+                		<execution>

+                    		<phase>initialize</phase>

+                    		<goals>

+                        		<goal>read-project-properties</goal>

+                    		</goals>

+                    		<configuration>

+    	                   		<files>

+		                            <file>${basedir}/moa-id.properties</file>

+      		                  </files>

+          		          </configuration>

+              		  </execution>

+            		</executions>

+        		</plugin>

 			<plugin>

 				<groupId>org.apache.maven.plugins</groupId>

 				<artifactId>maven-compiler-plugin</artifactId>

@@ -339,6 +359,7 @@
 				</executions>

 			</plugin>

 		</plugins>

+		</pluginManagement>

 	</build>

 

 </project>

diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 6c2e12c65..2fd8c4483 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -4,11 +4,12 @@
     <parent>
         <groupId>MOA.id</groupId>
         <artifactId>moa-id</artifactId>
-        <version>2.0.1</version>
+        <version>2.0.x</version>
     </parent>
     <artifactId>moa-id-commons</artifactId>
     <name>moa-id-commons</name>
     <groupId>MOA.id.server</groupId>
+    <version>${moa-id-version}</version>
 
     <profiles>
         <profile>
@@ -127,6 +128,7 @@
         </resources>
 
         <plugins>
+                
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -227,9 +229,9 @@
                     </execution>
                 </executions>
             </plugin>
-        </plugins>
-        <pluginManagement>
-            <plugins>
+           </plugins>
+           <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>
@@ -261,6 +263,24 @@
                         </lifecycleMappingMetadata>
                     </configuration>
                 </plugin>
+							<plugin>
+            		<groupId>org.codehaus.mojo</groupId>
+            		<artifactId>properties-maven-plugin</artifactId>
+            		<version>1.0-alpha-2</version>
+            		<executions>
+                		<execution>
+                    		<phase>initialize</phase>
+                    		<goals>
+                        		<goal>read-project-properties</goal>
+                    		</goals>
+                    		<configuration>
+    	                   		<files>
+		                            <file>${basedir}/moa-id.properties</file>
+      		                  </files>
+          		          </configuration>
+              		  </execution>
+            		</executions>
+        		</plugin>
             </plugins>
         </pluginManagement>
     </build>
diff --git a/id/server/pom.xml b/id/server/pom.xml
index d748c01eb..bbaac8e5e 100644
--- a/id/server/pom.xml
+++ b/id/server/pom.xml
@@ -4,7 +4,7 @@
     <parent>

         <groupId>MOA</groupId>

         <artifactId>id</artifactId>

-        <version>2.0.1</version>

+        <version>2.0.x</version>

     </parent>

 

     <modelVersion>4.0.0</modelVersion>

diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index e47b31144..ff6608451 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -2,7 +2,7 @@
 	<parent>

 		<groupId>MOA.id</groupId>

 		<artifactId>moa-id</artifactId>

-		<version>2.0.1</version>

+		<version>2.0.x</version>

 	</parent>

 	

 	<properties>