perfsonar development work

Author: dante.delvaux
Date: 2013-05-17 21:11:04 +0100 (Fri, 17 May 2013)
New Revision: 6403

Modified:
   trunk/parent/pom.xml
   trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml
   
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/pom.xml
   trunk/perfsonar-java-web-admin/pom.xml
Log:
WebAdmin: properly adding versions to submodules (do not inherit the webadmin 
parent one).

Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml        2013-05-17 20:09:10 UTC (rev 6402)
+++ trunk/parent/pom.xml        2013-05-17 20:11:04 UTC (rev 6403)
@@ -7,7 +7,7 @@
     
     <groupId>net.geant.perfsonar</groupId>
     <artifactId>parent</artifactId>
-    <version>1.0.3</version>
+    <version>1.0.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>

Modified: 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml
===================================================================
--- trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml 
  2013-05-17 20:09:10 UTC (rev 6402)
+++ trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml 
  2013-05-17 20:11:04 UTC (rev 6403)
@@ -1,10 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
        <modelVersion>4.0.0</modelVersion>
-       <artifactId>web-admin-component</artifactId>
-       <packaging>war</packaging>
-       <name>perfSONAR Web Admin Component</name>
-
+    
        <parent>
                <groupId>net.geant.perfsonar</groupId>
                <artifactId>web-admin</artifactId>
@@ -12,6 +9,12 @@
                <relativePath>..</relativePath>
        </parent>
 
+    <artifactId>web-admin-component</artifactId>
+    <version>1.1.1-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>perfSONAR Web Admin Component</name>
+
        <build>
                <finalName>${project.artifactId}</finalName>
 

Modified: 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/pom.xml
===================================================================
--- 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/pom.xml
      2013-05-17 20:09:10 UTC (rev 6402)
+++ 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/pom.xml
      2013-05-17 20:11:04 UTC (rev 6403)
@@ -1,6 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
        <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>net.geant.perfsonar</groupId>
         <artifactId>web-admin</artifactId>
@@ -9,7 +10,9 @@
     </parent>
 
        <artifactId>web-admin-exampleservice</artifactId>
+    <version>1.1.1-SNAPSHOT</version>
        <packaging>war</packaging>
+
        <name>perfSONAR Web Admin Example Service</name>
        <description>This is a example of how a perfSONAR service project can 
add the WebAdmin WAR as an overlay.  New servlet and JSP pages can be added 
in the service itself.
 

Modified: trunk/perfsonar-java-web-admin/pom.xml
===================================================================
--- trunk/perfsonar-java-web-admin/pom.xml      2013-05-17 20:09:10 UTC (rev 
6402)
+++ trunk/perfsonar-java-web-admin/pom.xml      2013-05-17 20:11:04 UTC (rev 
6403)
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>net.geant.perfsonar</groupId>
         <artifactId>parent</artifactId>
@@ -7,9 +9,8 @@
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
-       <modelVersion>4.0.0</modelVersion>
        <artifactId>perfsonar-java-web-admin</artifactId>
-       <version>1.1.2-SNAPSHOT</version>
+       <version>1.1.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>perfSONAR Web Admin</name>