perfsonar development work

Author: dante.delvaux
Date: 2013-04-29 19:21:50 +0100 (Mon, 29 Apr 2013)
New Revision: 6276

Modified:
   trunk/RELEASES.txt
   trunk/mvn-settings.xml
   trunk/parent/pom.xml
   
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RrdLibrary.java
Log:
Parent: correcting the maven-release-plugin and versions-maven-plugin 
integration and associated documentation.

Modified: trunk/RELEASES.txt
===================================================================
--- trunk/RELEASES.txt  2013-04-29 17:01:57 UTC (rev 6275)
+++ trunk/RELEASES.txt  2013-04-29 18:21:50 UTC (rev 6276)
@@ -17,7 +17,10 @@
 
 If you want to manually release a module run (in the module own directory):
     cd module-name
-    mvn release:clean release:prepare
+    mvn release:clean release:prepare release:perform
+    cd ..
+    mvn versions:update-parent versions:use-releases
+    mvn release:update-versions -pl module-name
     
  - answer the release plugin questions (defaults are usually ok)
  - the following will be done:

Modified: trunk/mvn-settings.xml
===================================================================
--- trunk/mvn-settings.xml      2013-04-29 17:01:57 UTC (rev 6275)
+++ trunk/mvn-settings.xml      2013-04-29 18:21:50 UTC (rev 6276)
@@ -15,15 +15,22 @@
       </activation>
       <repositories>
         <repository>
-            <id>perfsonar-snapshot-repository</id>
-            <name>perfSONAR repository</name>
+            <id>perfsonar-releases-repository</id>
+            <name>perfSONAR releases repository</name>
             
<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>
         </repository>
+        <repository>
+            <id>perfsonar-snapshot-repository</id>
+            <name>perfSONAR snapshot repository</name>
+            
<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>
+        </repository>
       </repositories>
     </profile>
   </profiles>
-
 </settings>

Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml        2013-04-29 17:01:57 UTC (rev 6275)
+++ trunk/parent/pom.xml        2013-04-29 18:21:50 UTC (rev 6276)
@@ -136,7 +136,7 @@
                     
<tagBase>svn+ssh:///GEANT/SA2/ps-java-services/tags/${project.artifactId}/</tagBase>
                     <tagNameFormat>@{project.version}</tagNameFormat>
                     <scmCommentPrefix>[${project.artifactId}]: 
</scmCommentPrefix>
-                    <completionGoals>release:perform versions:update-parent 
versions:use-releases</completionGoals>
+                    
<updateWorkingCopyVersions>false</updateWorkingCopyVersions>
                 </configuration>
             </plugin>
             <plugin>

Modified: 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RrdLibrary.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RrdLibrary.java
  2013-04-29 17:01:57 UTC (rev 6275)
+++ 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RrdLibrary.java
  2013-04-29 18:21:50 UTC (rev 6276)
@@ -15,6 +15,7 @@
  */
 public interface RrdLibrary extends Library
 {
+    // CHECKSTYLE_OFF: ALL
     public static final String JNA_LIBRARY_NAME = "rrd";
     public static final NativeLibrary JNA_NATIVE_LIB = 
NativeLibrary.getInstance(RrdLibrary.JNA_LIBRARY_NAME);
     public static final RrdLibrary INSTANCE = (RrdLibrary) 
Native.loadLibrary(RrdLibrary.JNA_LIBRARY_NAME,
@@ -48,4 +49,5 @@
         }
     }
 
+    // CHECKSTYLE_ON: ALL
 }