perfsonar development work

Author: dante.delvaux
Date: 2013-04-29 20:47:21 +0100 (Mon, 29 Apr 2013)
New Revision: 6292

Modified:
   trunk/RELEASES.txt
   trunk/mvn-settings.xml
   trunk/nmwg-sql-converter/pom.xml
   trunk/parent/pom.xml
Log:
Correcting nmwg-sql-converter version number and finishing the releases 
documentation.

Modified: trunk/RELEASES.txt
===================================================================
--- trunk/RELEASES.txt  2013-04-29 19:07:20 UTC (rev 6291)
+++ trunk/RELEASES.txt  2013-04-29 19:47:21 UTC (rev 6292)
@@ -21,11 +21,9 @@
  - answer the release plugin questions (defaults are usually ok)
  - the following will be done:
    - "-SNAPSHOT" suffix will be removed from the version number 
-   - the module will be published to the artifactory server
    - a tag will be created in SVN
    - in trunk, the version number will be increased and -SNAPSHOT added again
-   - the "release:perform" step will be done inside the "release-prepare" 
(see
-     parent/pom.xml)
+   - the module will be published to the artifactory server
 
 With Jenkins
 ------------
@@ -35,19 +33,19 @@
 You got to the "Release" action, choose the module you want to release and 
make
 it happen!  All is done through the maven-release-plugin:
  - removing the -SNAPSHOT from the module version number
- - publishing in the artifactory server
  - tagging the release in SVN
+ - increasing the module version number and adding -SNAPSHOT again
+ - publishing in the artifactory server
 
-But the Jenkins server is currently not configured to be able to commit to 
our
+*But* the Jenkins server is currently not configured to be able to commit to 
our
 SVN repository.  See https://issues.geant.net/jira/browse/SWDSD-446
 
 Replacing references to -SNAPSHOT with a new release
 ----------------------------------------------------
-After having released a new module:
+After having released a new module, run:
     mvn versions:use-releases
 
-After having released a new parent (this should be done in the same step as 
the
-maven-release-plugin commit to trunk, how?):
+After having released a new parent, run:
     mvn versions:update-parent
  
 Releasing a perfSONAR service

Modified: trunk/mvn-settings.xml
===================================================================
--- trunk/mvn-settings.xml      2013-04-29 19:07:20 UTC (rev 6291)
+++ trunk/mvn-settings.xml      2013-04-29 19:47:21 UTC (rev 6292)
@@ -2,13 +2,14 @@
   xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 
http://maven.apache.org/xsd/settings-1.0.0.xsd";>
   <profiles>
     <profile>
-      <!-- We setup a profile to define the perfSONAR repo where we can get 
released perfSONAR artifacts. -->
-      <!-- This is intended to solve the chicken and egg problem of relying 
on the parent pom to define -->
-      <!-- the repository where the parent pom is actually deployed! -->
-      <!-- This settings.xml file is used by the Jenkins tool for automatic 
deployements of new releases -->
+      <!-- We setup a profile to define the perfSONAR repos where we can get 
perfSONAR artifacts. -->
+      <!-- This is intended to solve the chicken and egg problem of relying 
on the parent pom to -->
+      <!-- define the repository where the parent pom is actually deployed! 
-->
+      <!-- This settings.xml file is used by the Jenkins tool for continous 
integration builds -->
+      <!-- and for automatic deployments of new releases. -->
       <!-- To use it, one must add "-s mvn-settings.xml" option in the maven 
call. -->
-      <!-- You can olso copy it to your ~/.m2/settings.xml file and activate 
this profile only on demand. -->
-      <!-- Using it is then a call to "mvn clean package -P ps-build" -->
+      <!-- You can also copy it to your ~/.m2/settings.xml file and activate 
it by default -->
+      <!-- or use this profile only on demand like "mvn clean package -P 
ps-build" -->
       <id>ps-build</id>
       <activation>
         <activeByDefault>true</activeByDefault>
@@ -17,7 +18,7 @@
         <repository>
             <id>perfsonar-releases-repository</id>
             <name>perfSONAR releases repository</name>
-            
<url>https://artifactory.geant.net/artifactory/perfsonar-release-local/</url>
+            
<url>https://artifactory.geant.net/artifactory/perfsonar-release-local</url>
             <!-- We consider only properly released artifacts, no snapshots! 
-->
             
<releases><enabled>true</enabled><updatePolicy>always</updatePolicy></releases>
             <snapshots><enabled>false</enabled></snapshots>
@@ -25,7 +26,7 @@
         <repository>
             <id>perfsonar-snapshot-repository</id>
             <name>perfSONAR snapshot repository</name>
-            
<url>https://artifactory.geant.net/artifactory/perfsonar-snapshot-local/</url>
+            
<url>https://artifactory.geant.net/artifactory/perfsonar-snapshot-local</url>
             <!-- We consider only snapshot here! -->
             <releases><enabled>false</enabled></releases>
             <snapshots><enabled>true</enabled></snapshots>

Modified: trunk/nmwg-sql-converter/pom.xml
===================================================================
--- trunk/nmwg-sql-converter/pom.xml    2013-04-29 19:07:20 UTC (rev 6291)
+++ trunk/nmwg-sql-converter/pom.xml    2013-04-29 19:47:21 UTC (rev 6292)
@@ -8,7 +8,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>nmwg-sql-converter</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>NMWG metadata-data converter - XML to SQL</name>

Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml        2013-04-29 19:07:20 UTC (rev 6291)
+++ trunk/parent/pom.xml        2013-04-29 19:47:21 UTC (rev 6292)
@@ -57,19 +57,30 @@
                </developer>
        </developers>
        <contributors>
-          <!-- Contributors and retired developers -->
-          <contributor>
+           <!-- Contributors and retired developers -->
+           <contributor>
             <name>Slawomir Trzaszczka</name>
             
<email></email>
             <organization>Poznan Supercomputing and Networking 
Center</organization>
             <organizationUrl>http://man.poznan.pl/</organizationUrl>
-          </contributor>
+           </contributor>
                <contributor>
                        <name>Wiktor Procyk</name>
                        
<email></email>
                        <organization>Poznan Supercomputing and Networking 
Center</organization>
                        
<organizationUrl>http://www.man.poznan.pl/</organizationUrl>
                </contributor>
+        <contributor>
+            <name>Piotr Pikusa</name>
+            
<email></email>
+            <organization>Poznan Supercomputing and Networking 
Center</organization>
+            <organizationUrl>http://man.poznan.pl/</organizationUrl>
+        </contributor>
+               <contributor>
+                   <name>Gerd Berhmann</name>
+                   
<email></email>
+                   <organization>NORDUnet</organization>
+               </contributor>
        </contributors>
 
        <!-- This needs to be copied and tailored in each of the subprojects 
with the correct component id from JIRA -->