perfsonar development work

Author: dante.delvaux
Date: 2013-04-29 15:46:41 +0100 (Mon, 29 Apr 2013)
New Revision: 6269

Modified:
   trunk/RELEASES.txt
   trunk/nmwg-sql-converter/pom.xml
   trunk/parent/pom.xml
   trunk/perfsonar-java-base2/pom.xml
   trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
   trunk/perfsonar-java-rrd-ma/doc/
   trunk/perfsonar-java-web-admin/pom.xml
   trunk/pom.xml
Log:
Releasing a module:
 - better configuration of the maven-release-plugin and versions-maven-plugin
 - augmented documentation

Modified: trunk/RELEASES.txt
===================================================================
--- trunk/RELEASES.txt  2013-04-29 13:00:59 UTC (rev 6268)
+++ trunk/RELEASES.txt  2013-04-29 14:46:41 UTC (rev 6269)
@@ -15,16 +15,18 @@
 those modules have their own release cycles, depending on the need for them 
to
 change (some are very stable, others less).
 
-If you want to manually release a module do:
- - go into the module directory
- - run "mvn release:clean release:prepare release:perform"
+If you want to manually release a module run:
+    mvn release:clean release:prepare release:perform -pl module-name
+    
  - 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
-   - the version number will be increased and -SNAPSHOT added again
+   - in trunk, the version number will be increased and -SNAPSHOT added again
 
+With Jenkins
+------------
 Ideally, making a release would be done through Jenkins, with the pS-rel job 
at
 https://ci.geant.net/jenkins/view/perfSONAR/job/pS-rel
 
@@ -40,12 +42,11 @@
 Replacing references to -SNAPSHOT with a new release
 ----------------------------------------------------
 After having released a new module:
-    mvn versions:unlock-snapshots -Dincludes=net.geant.perfsonar
+    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?):
     mvn versions:update-parent
-    mvn versions:commit (if all went well)
  
 Releasing a perfSONAR service
 -----------------------------
@@ -55,3 +56,12 @@
 Notes
 -----
 See mvn-settings.xml if you have some issues finding a released parent 
pom.xml
+
+When preparing a release of a new module, it might be a good time to see if 
any
+maven plugins or dependencies should be upgraded.  This can be done with the
+versions-maven-plugin by running:
+    mvn versions:display-plugin-updates versions:display-dependency-updates \
+      -pl module-name
+    
+However, upgrading a dependency version means you need to test your code 
again
+to see if no changes have been introduced.

Modified: trunk/nmwg-sql-converter/pom.xml
===================================================================
--- trunk/nmwg-sql-converter/pom.xml    2013-04-29 13:00:59 UTC (rev 6268)
+++ trunk/nmwg-sql-converter/pom.xml    2013-04-29 14:46:41 UTC (rev 6269)
@@ -2,7 +2,7 @@
     <parent>
         <groupId>net.geant.perfsonar</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -14,6 +14,12 @@
     <name>NMWG metadata-data converter - XML to SQL</name>
     <inceptionYear>2012</inceptionYear>
 
+    <issueManagement>
+        <system>JIRA</system>
+        <!-- Same component ID as the RRD MA -->
+        
<url>https://issues.geant.net/jira/browse/PSSERVICES/component/10666</url>
+    </issueManagement>
+
     <scm>
         
<connection>scm:svn:http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/nmwg-sql-converter/</connection>
         
<developerConnection>scm:svn:svn+ssh:///GEANT/SA2/ps-java-services/trunk/nmwg-sql-converter/</developerConnection>
@@ -52,10 +58,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file

Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml        2013-04-29 13:00:59 UTC (rev 6268)
+++ trunk/parent/pom.xml        2013-04-29 14:46:41 UTC (rev 6269)
@@ -1,6 +1,10 @@
 <?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>
+    <prerequisites>
+        <maven>3.0.0</maven>
+    </prerequisites>
+    
     <groupId>net.geant.perfsonar</groupId>
     <artifactId>parent</artifactId>
     <version>1.0.2-SNAPSHOT</version>
@@ -26,10 +30,6 @@
         <url>http://www.geant.net</url>
     </organization>
 
-    <prerequisites>
-        <maven>3.0.0</maven>
-    </prerequisites>
-    
     <developers>
         <developer>
                        <id>antoine.delvaux</id>
@@ -72,6 +72,7 @@
                </contributor>
        </contributors>
 
+       <!-- This needs to be copied and tailored in each of the subprojects 
with the correct component id from JIRA -->
     <issueManagement>
         <system>JIRA</system>
         <url>http://issues.geant.net/jira/browse/PSSERVICES</url>
@@ -126,15 +127,26 @@
 
     <build>
         <plugins>
+            <!-- Release management plugins, needed by submodules, see 
RELEASES.txt -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>2.4</version>
+                <version>2.4.1</version>
                 <configuration>
                     
<tagBase>svn+ssh:///GEANT/SA2/ps-java-services/tags/${project.artifactId}/</tagBase>
                     <tagNameFormat>@{project.version}</tagNameFormat>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>2.0</version>
+                <configuration>
+                   <excludeReactor>false</excludeReactor>
+                   <include>net.geant.perfsonar</include>
+                   <generateBackupPoms>false</generateBackupPoms>
+                </configuration>
+            </plugin>
         </plugins>
     
         <pluginManagement>
@@ -144,7 +156,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.0</version>
+                    <version>3.1</version>
                     <configuration>
                         <source>${maven-compiler-plugin.source}</source>
                         <target>${maven-compiler-plugin.target}</target>
@@ -168,14 +180,18 @@
                     <artifactId>maven-resources-plugin</artifactId>
                     <version>2.6</version>
                 </plugin>
-
-                <!-- Release management plugins -->
+                
                 <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>versions-maven-plugin</artifactId>
-                    <version>2.0</version>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>2.5</version>
                 </plugin>
-                
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>2.4</version>
+                </plugin>
+
                 <!-- Packaging plugins -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -206,7 +222,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.3.5</version>
+                    <version>2.3.7</version>
                     <extensions>true</extensions>
                 </plugin>
 
@@ -256,7 +272,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.12.4</version>
+                    <version>2.14.1</version>
                     <configuration>
                         <forkMode>always</forkMode>
                     </configuration>
@@ -284,7 +300,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>2.9.1</version>
+                    <version>2.10</version>
                     <executions>
                         <execution>
                             <id>check-style</id>
@@ -306,7 +322,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-pmd-plugin</artifactId>
-                    <version>2.7.1</version>
+                    <version>3.0.1</version>
                     <configuration>
                         <linkXRef>false</linkXRef>
                         
<sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
@@ -416,6 +432,21 @@
                 </configuration>
             </plugin>
 
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>versions-maven-plugin</artifactId>
+                               <version>2.0</version>
+                               <reportSets>
+                                       <reportSet>
+                                               <reports>
+                                                       
<report>dependency-updates-report</report>
+                                                       
<report>plugin-updates-report</report>
+                                                       
<report>property-updates-report</report>
+                                               </reports>
+                                       </reportSet>
+                               </reportSets>
+                       </plugin>
+
         </plugins>
     </reporting>
     
@@ -430,12 +461,12 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>1.6.6</version>
+                <version>1.7.5</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-log4j12</artifactId>
-                <version>1.6.6</version>
+                <version>1.7.5</version>
             </dependency>
             <dependency>
                 <groupId>log4j</groupId>
@@ -472,7 +503,7 @@
             <dependency>
                 <groupId>xmlunit</groupId>
                 <artifactId>xmlunit</artifactId>
-                <version>1.3</version>
+                <version>1.4</version>
                 <scope>test</scope>
             </dependency>
             <dependency>

Modified: trunk/perfsonar-java-base2/pom.xml
===================================================================
--- trunk/perfsonar-java-base2/pom.xml  2013-04-29 13:00:59 UTC (rev 6268)
+++ trunk/perfsonar-java-base2/pom.xml  2013-04-29 14:46:41 UTC (rev 6269)
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.geant.perfsonar</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -18,6 +18,11 @@
     <description>The perfSONAR base provides a number of common, shared 
classes which can be used by MA, MP and Clients.</description>
     <inceptionYear>2009</inceptionYear>
 
+       <issueManagement>
+               <system>JIRA</system>
+               
<url>https://issues.geant.net/jira/browse/PSSERVICES/component/10675</url>
+       </issueManagement>
+
     <scm>
         
<connection>scm:svn:http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/perfsonar-java-base2/</connection>
         
<developerConnection>scm:svn:svn+ssh:///GEANT/SA2/ps-java-services/trunk/perfsonar-java-base2/</developerConnection>


Property changes on: trunk/perfsonar-java-rrd-ma/doc
___________________________________________________________________
Modified: svn:externals
   - schema -r387       
https://svn.internet2.edu/svn/nmwg/trunk/nmwg/schema/rnc/

   + schema -r387       
http://anonsvn.internet2.edu/svn/nmwg/trunk/nmwg/schema/rnc/


Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml     2013-04-29 13:00:59 
UTC (rev 6268)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml     2013-04-29 14:46:41 
UTC (rev 6269)
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.geant.perfsonar</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -16,15 +16,17 @@
     <packaging>war</packaging>
 
     <properties>
-        <configurationFile>configuration.xml</configurationFile>
         <axis2Id>axis2-1.4.1</axis2Id>
         <aar.name>${project.artifactId}</aar.name>
-        <version.nmwg-sql-converter>1.0.1</version.nmwg-sql-converter>
         <installName>${project.artifactId}</installName>
         <installPath>/usr/lib/perfsonar/services/${installName}</installPath>
-        <jira-component-id>10666</jira-component-id>
     </properties>
 
+    <issueManagement>
+        <system>JIRA</system>
+        
<url>https://issues.geant.net/jira/browse/PSSERVICES/component/10666</url>
+    </issueManagement>
+
     <scm>
         
<connection>scm:svn:http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/perfsonar-java-rrd-ma-SQL_backend/</connection>
         
<developerConnection>scm:svn:svn+ssh:///GEANT/SA2/ps-java-services/trunk/perfsonar-java-rrd-ma-SQL_backend/</developerConnection>
@@ -157,7 +159,7 @@
         <dependency>
             <groupId>net.geant.perfsonar</groupId>
             <artifactId>nmwg-sql-converter</artifactId>
-            <version>${version.nmwg-sql-converter}</version>
+            <version>1.0.2</version>
             <classifier>jar-with-dependencies</classifier>
         </dependency>
 
@@ -177,13 +179,13 @@
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna</artifactId>
-            <version>3.4.0</version>
+            <version>3.5.2</version>
         </dependency>
 
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
-            <version>1.4</version>
+            <version>1.5.2</version>
         </dependency>
 
         <!-- JPA -->
@@ -208,7 +210,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.21</version>
+            <version>5.1.24</version>
         </dependency>
 
     </dependencies>

Modified: trunk/perfsonar-java-web-admin/pom.xml
===================================================================
--- trunk/perfsonar-java-web-admin/pom.xml      2013-04-29 13:00:59 UTC (rev 
6268)
+++ trunk/perfsonar-java-web-admin/pom.xml      2013-04-29 14:46:41 UTC (rev 
6269)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.geant.perfsonar</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml       2013-04-29 13:00:59 UTC (rev 6268)
+++ trunk/pom.xml       2013-04-29 14:46:41 UTC (rev 6269)
@@ -2,6 +2,10 @@
 <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>
+       <prerequisites>
+           <maven>2.2.1</maven>
+       </prerequisites>
+
     <groupId>net.geant.perfsonar</groupId>
     <artifactId>aggregator</artifactId>
     <version>1.0.0-SNAPSHOT</version>