perfsonar development work

Author: nordunet.behrmann
Date: 2012-12-07 16:20:50 +0000 (Fri, 07 Dec 2012)
New Revision: 6059

Modified:
   trunk/perfsonar-java-sql-ma/pom.xml
   trunk/perfsonar_base/pom.xml
Log:
perfsonar_base, perfsonar-java-sql-ma: Added additional environment and 
development information to Maven file

Modified: trunk/perfsonar-java-sql-ma/pom.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/pom.xml 2012-12-06 11:29:50 UTC (rev 6058)
+++ trunk/perfsonar-java-sql-ma/pom.xml 2012-12-07 16:20:50 UTC (rev 6059)
@@ -3,35 +3,53 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.geant.perfsonar</groupId>
     <artifactId>perfsonar-java-sql-ma</artifactId>
+    <version>2.3.4-SNAPSHOT</version>
     <packaging>war</packaging>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <slf4j.version>1.6.6</slf4j.version>
+    </properties>
+
     <name>SQL Measurement Archive</name>
-    <version>2.3.4-SNAPSHOT</version>
-    <description>Relational Database Measurement Archive for
-        perfSONAR. For more information see the wiki-page.</description>
+    <description>Relational Database Measurement Archive for 
PerfSONAR.</description>
     <url>http://perfsonar.geant.net/</url>
+    <inceptionYear>2008</inceptionYear>
+    <licenses>
+        <license>
+            <name>GÉANT Standard Open Source Software Outward Licence</name>
+            <distribution>manual</distribution>
+        </license>
+    </licenses>
+    <organization>
+        <name>GEANT</name>
+        <url>http://www.geant.net</url>
+    </organization>
 
     <issueManagement>
         <system>JIRA</system>
-        <url>https://issues.geant.net/jira/browse/PSSERVICES</url>
+        <url>http://issues.geant.net/jira/browse/PSSERVICES</url>
     </issueManagement>
-
-    <inceptionYear>2008</inceptionYear>
-
     <scm>
-        <connection>scm:svn:anonsvn.internet2.edu/svn/</connection>
-        
<developerConnection>scm:svn:svn.internet2.edu/svn/perfsonar/</developerConnection>
+        
<connection>scm:svn:http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/perfsonar-java-sql-ma/</connection>
+        
<developerConnection>scm:svn:svn+ssh:///GEANT/SA2/ps-java-services/trunk/perfsonar-java-sql-ma</developerConnection>
+        <url>https://svn.geant.net/fisheye/browse/SA2T3-ps-javaservices</url>
     </scm>
+    <prerequisites>
+        <maven>3.0.0</maven>
+    </prerequisites>
+    <distributionManagement>
+        
<downloadUrl>https://build.shibboleth.net/nexus/content/repositories/releases/</downloadUrl>
+        <repository>
+            <id>perfsonar-release-repository</id>
+            
<url>https://artifactory.geant.net/artifactory/perfsonar-release-local</url>
+        </repository>
+        <snapshotRepository>
+            <id>perfsonar-snapshot-repository</id>
+            
<url>https://artifactory.geant.net/artifactory/perfsonar-snapshot-local</url>
+        </snapshotRepository>
+    </distributionManagement>
 
-    <organization>
-        <name>perfSONAR</name>
-        <url>http://www.perfsonar.net</url>
-    </organization>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <slf4j.version>1.6.6</slf4j.version>
-    </properties>
-
     <build>
         <finalName>geant2-java-sql-ma</finalName>
         <plugins>
@@ -152,7 +170,11 @@
                     </execution>
                 </executions>
             </plugin>
-
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.7</version>
+            </plugin>
         </plugins>
     </build>
     <repositories>

Modified: trunk/perfsonar_base/pom.xml
===================================================================
--- trunk/perfsonar_base/pom.xml        2012-12-06 11:29:50 UTC (rev 6058)
+++ trunk/perfsonar_base/pom.xml        2012-12-07 16:20:50 UTC (rev 6059)
@@ -4,27 +4,54 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.geant.perfsonar</groupId>
     <artifactId>perfsonar_base</artifactId>
+    <version>1.1.3-SNAPSHOT</version>
     <packaging>jar</packaging>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <axis2.version>1.6.2</axis2.version>
+        <axis1.version>1.4</axis1.version>
+        <slf4j.version>1.6.6</slf4j.version>
+    </properties>
+
     <name>Perfsonar Base package</name>
-    <version>1.1.3-SNAPSHOT</version>
     <description>
         The perfSONAR base provides a number of common, shared classes which 
can be used by
         MA, MP and Clients.
     </description>
     <url>http://perfsonar.geant.net/</url>
+    <inceptionYear>2007</inceptionYear>
+    <licenses>
+        <license>
+            <name>GÉANT Standard Open Source Software Outward Licence</name>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <organization>
+        <name>GEANT</name>
+        <url>http://www.geant.net</url>
+    </organization>
+
     <issueManagement>
-        <system>bugzilla</system>
-        <url>http://bugzilla.perfsonar.net</url>
+        <system>JIRA</system>
+        <url>http://issues.geant.net/jira/browse/PSSERVICES</url>
     </issueManagement>
-    <inceptionYear>2007</inceptionYear>
     <scm>
-        <connection>scm:svn:http://anonsvn.internet2.edu/svn/</connection>
-        
<developerConnection>scm:svn:http://svn.internet2.edu/svn/perfsonar/</developerConnection>
+        
<connection>scm:svn:http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/perfsonar_base/</connection>
+        
<developerConnection>scm:svn:svn+ssh:///GEANT/SA2/ps-java-services/trunk/perfsonar_base</developerConnection>
+        <url>https://svn.geant.net/fisheye/browse/SA2T3-ps-javaservices</url>
     </scm>
-    <organization>
-        <name>perfSONAR</name>
-        <url>http://www.perfsonar.net</url>
-    </organization>
+    <distributionManagement>
+        
<downloadUrl>https://build.shibboleth.net/nexus/content/repositories/releases/</downloadUrl>
+        <repository>
+            <id>perfsonar-release-repository</id>
+            
<url>https://artifactory.geant.net/artifactory/perfsonar-release-local</url>
+        </repository>
+        <snapshotRepository>
+            <id>perfsonar-snapshot-repository</id>
+            
<url>https://artifactory.geant.net/artifactory/perfsonar-snapshot-local</url>
+        </snapshotRepository>
+    </distributionManagement>
 
     <build>
         <plugins>
@@ -57,6 +84,11 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.7</version>
+            </plugin>
         </plugins>
     </build>
 
@@ -88,7 +120,6 @@
         </repository>
     </repositories>
 
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -103,11 +134,6 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-    <properties>
-        <axis2.version>1.6.2</axis2.version>
-        <axis1.version>1.4</axis1.version>
-        <slf4j.version>1.6.6</slf4j.version>
-    </properties>
 
     <dependencies>
         <dependency>