Skip to Content.
Sympa Menu

perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6064 - in trunk: . nmwg-sql-converter perfsonar-java-base2 perfsonar-java-rrd-ma-SQL_backend

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/ps-java-services] r6064 - in trunk: . nmwg-sql-converter perfsonar-java-base2 perfsonar-java-rrd-ma-SQL_backend


Chronological Thread 
  • From:
  • To:
  • Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6064 - in trunk: . nmwg-sql-converter perfsonar-java-base2 perfsonar-java-rrd-ma-SQL_backend
  • Date: Mon, 10 Dec 2012 15:49:14 +0000 (GMT)
Author: nordunet.behrmann
Date: 2012-12-10 15:49:14 +0000 (Mon, 10 Dec 2012)
New Revision: 6064

Modified:
trunk/nmwg-sql-converter/pom.xml
trunk/perfsonar-java-base2/pom.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
trunk/pom.xml
Log:
nmwg-sql-converter, perfsonar-java-base2, perfsonar-java-rrd-ma-SQL_backend:
Update Maven packagin

- Use -SNAPSHOT versions
- Use -SNAPSHOT dependencies
- Add project management information
- Use standard build directories

Modified: trunk/nmwg-sql-converter/pom.xml
===================================================================
--- trunk/nmwg-sql-converter/pom.xml 2012-12-08 15:42:19 UTC (rev 6063)
+++ trunk/nmwg-sql-converter/pom.xml 2012-12-10 15:49:14 UTC (rev 6064)
@@ -3,18 +3,53 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.geant.perfsonar</groupId>
<artifactId>nmwg-sql-converter</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
<name>NMWG metadata-data converter to SQL </name>
+ <url>http://perfsonar.geant.net/</url>
+ <inceptionYear>2012</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>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://issues.geant.net/jira/browse/PSSERVICES</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>
+ <url>https://svn.geant.net/fisheye/browse/SA2T3-ps-javaservices</url>
+ </scm>
+ <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>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -22,7 +57,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <version>3.0</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -31,7 +66,7 @@

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
<configuration>
<finalName>nmwg-converter</finalName>
<archive>

Modified: trunk/perfsonar-java-base2/pom.xml
===================================================================
--- trunk/perfsonar-java-base2/pom.xml 2012-12-08 15:42:19 UTC (rev 6063)
+++ trunk/perfsonar-java-base2/pom.xml 2012-12-10 15:49:14 UTC (rev 6064)
@@ -1,93 +1,106 @@
<?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";>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>

- <modelVersion>4.0.0</modelVersion>
- <groupId>net.geant.perfsonar</groupId>
- <artifactId>perfsonar-java-base2</artifactId>
- <packaging>jar</packaging>
- <name>Perfsonar Base2 package</name>
- <version>1.0.7</version>
- <description>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>perfsonar-java-base2</artifactId>
+ <packaging>jar</packaging>
+ <version>1.1-SNAPSHOT</version>
+
+ <name>Perfsonar Base2 package</name>
+ <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>2009</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>

+ <developers>
+ <developer>
+ <id>szwed</id>
+ <name>Blazej Pietrzak</name>
+
<email></email>
+ <url></url>
+ <organization>Poznan Supercomputing and Networking
Center</organization>
+ <organizationUrl>http://man.poznan.pl/</organizationUrl>
+ <roles>
+ <role>designer</role>
+ <role>developer</role>
+ </roles>
+ <timezone>1</timezone>
+ <properties>
+ <skype>blazej980</skype>
+ </properties>
+ </developer>
+ <developer>
+ <id>trzaszcz</id>
+ <name>Slawomir Trzaszczka</name>
+
<email></email>
+ <url></url>
+ <organization>Poznan Supercomputing and Networking
Center</organization>
+ <organizationUrl>http://man.poznan.pl/</organizationUrl>
+ <roles>
+ <role>designer</role>
+ <role>developer</role>
+ </roles>
+ <timezone>1</timezone>
+ <properties>
+ <skype>slawomir.trzaszczka.pcss</skype>
+ </properties>
+ </developer>
+ </developers>
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

- <developers>
- <developer>
- <id>szwed</id>
- <name>Blazej Pietrzak</name>
-
<email></email>
- <url></url>
- <organization>Poznan Supercomputing and Networking
Center</organization>
- <organizationUrl>http://man.poznan.pl/</organizationUrl>
- <roles>
- <role>designer</role>
- <role>developer</role>
- </roles>
- <timezone>1</timezone>
- <properties>
- <skype>blazej980</skype>
- </properties>
- </developer>
- <developer>
- <id>trzaszcz</id>
- <name>Slawomir Trzaszczka</name>
-
<email></email>
- <url></url>
- <organization>Poznan Supercomputing and Networking
Center</organization>
- <organizationUrl>http://man.poznan.pl/</organizationUrl>
- <roles>
- <role>designer</role>
- <role>developer</role>
- </roles>
- <timezone>1</timezone>
- <properties>
- <skype>slawomir.trzaszczka.pcss</skype>
- </properties>
- </developer>
- </developers>
-
- <url>http://perfsonar.geant.net/</url>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://issues.geant.net/jira/browse/PSSERVICES</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>
+ <url>https://svn.geant.net/fisheye/browse/SA2T3-ps-javaservices</url>
+ </scm>
+ <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>

- <issueManagement>
- <system>jira</system>
- <url>http://issues.geant.net/</url>
- </issueManagement>
-
- <inceptionYear>2009</inceptionYear>
-
- <scm>
-
<connection>scm:svn:http://svn.geant.net/GEANT/SA2/ps-java-services</connection>
-
<developerConnection>scm:svn:svn+ssh:///GEANT/SA2/ps-java-services</developerConnection>
- </scm>
-
- <organization>
- <name>perfSONAR</name>
- <url>http://www.perfsonar.net</url>
- </organization>
-
- <build>
- <outputDirectory>${project.basedir}/bin</outputDirectory>
- <directory>${project.basedir}/build</directory>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
+ <build>
+ <plugins>
<plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.0</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12.2</version>
+ <version>2.12.4</version>
<configuration>
<forkMode>always</forkMode>
</configuration>
@@ -106,380 +119,371 @@
</configuration>
</plugin>
</plugins>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-external</artifactId>
- <version>2.2</version>
- </extension>
- </extensions>
- </build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>2.3</version>
+ </extension>
+ </extensions>
+ </build>

- <repositories>
- <repository>
- <id>ibiblio</id>
- <name>ibiblio repository</name>
- <url>http://mirrors.ibiblio.org/pub/mirrors/maven2/</url>
- </repository>
- <repository>
+ <repositories>
+ <repository>
+ <id>ibiblio</id>
+ <name>ibiblio repository</name>
+ <url>http://mirrors.ibiblio.org/pub/mirrors/maven2/</url>
+ </repository>
+ <repository>
<id>shibboleth.internet2.edu</id>
<name>shibboleth repository</name>

<url>https://build.shibboleth.net/nexus/content/repositories/releases/</url>
- </repository>
- <repository>
- <id>shibboleth-3rd-party</id>
- <name>shibboleth 3rd party</name>
-
<url>https://build.shibboleth.net/nexus/content/repositories/thirdparty/</url>
- </repository>
- <repository>
+ </repository>
+ <repository>
+ <id>shibboleth-3rd-party</id>
+ <name>shibboleth 3rd party</name>
+
<url>https://build.shibboleth.net/nexus/content/repositories/thirdparty/</url>
+ </repository>
+ <repository>
<id>geant-repository</id>
<name>GEANT repository</name>
<url>https://artifactory.geant.net/artifactory/repo/</url>
- </repository>
- <repository>
+ </repository>
+ <repository>
<id>geant-repository-3rd-party</id>
<name>GEANT repository</name>

<url>https://artifactory.geant.net/artifactory/geant-repo/net/geant/3rdparty/</url>
- </repository>
- <repository>
- <id>codehaus-release-repo</id>
- <name>Codehaus Release Repo</name>
- <url>http://repository.codehaus.org</url>
- </repository>
- </repositories>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.6.6</version>
- </dependency>
+ </repository>
+ <repository>
+ <id>codehaus-release-repo</id>
+ <name>Codehaus Release Repo</name>
+ <url>http://repository.codehaus.org</url>
+ </repository>
+ </repositories>
+
+ <dependencyManagement>
+ <dependencies>
<dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>xmltooling</artifactId>
- <version>1.1.0</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.6.6</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.6.6</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>xmltooling</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.6.6</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>

- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>2.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxws</artifactId>
- <version>1.4.1</version>
- <exclusions>
- <exclusion>
- <artifactId>stax-api</artifactId>
- <groupId>javax.xml.stream</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xalan</artifactId>
- <groupId>xalan</groupId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>2.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxws</artifactId>
+ <version>1.4.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>stax-api</artifactId>
+ <groupId>javax.xml.stream</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xalan</artifactId>
+ <groupId>xalan</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>

- <!-- got for auth -->
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- <version>1.40</version>
- </dependency>
- <dependency>
- <groupId>net.geant2.edugain</groupId>
- <artifactId>edugain</artifactId>
- <version>1.0-RC4</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>opensaml</groupId>
- <artifactId>opensaml</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>net.geant.perfsonar</groupId>
- <artifactId>perfsonar-authr</artifactId>
- <version>0.5</version>
- </dependency>
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>xmltooling</artifactId>
- <version>1.2.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>wss4j</groupId>
- <artifactId>wss4j</artifactId>
- <version>1.5.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart-core</artifactId>
- <version>1.4</version>
- <exclusions>
- <exclusion>
- <artifactId>opensaml</artifactId>
- <groupId>opensaml</groupId>
- </exclusion>
- <exclusion>
- <artifactId>bcprov-jdk13</artifactId>
- <groupId>bouncycastle</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xmlsec</artifactId>
-
<groupId>org.apache.santuario</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xalan</artifactId>
- <groupId>xalan</groupId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xerces</groupId>
- <artifactId>xml-apis</artifactId>
- <version>2.9.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xerces</groupId>
- <artifactId>serializer</artifactId>
- <version>2.9.1</version>
- </dependency>
- <dependency>
- <groupId>net.geant.perfsonar</groupId>
- <artifactId>sunxacml</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
+ <!-- got for auth -->
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ <version>1.40</version>
+ </dependency>
+ <dependency>
+ <groupId>net.geant2.edugain</groupId>
+ <artifactId>edugain</artifactId>
+ <version>1.0-RC4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>opensaml</groupId>
+ <artifactId>opensaml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>perfsonar-authr</artifactId>
+ <version>0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>xmltooling</artifactId>
+ <version>1.2.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>wss4j</groupId>
+ <artifactId>wss4j</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-core</artifactId>
+ <version>1.4</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>opensaml</artifactId>
+ <groupId>opensaml</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>bcprov-jdk13</artifactId>
+ <groupId>bouncycastle</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xmlsec</artifactId>
+ <groupId>org.apache.santuario</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xalan</artifactId>
+ <groupId>xalan</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>serializer</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>sunxacml</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>

- <dependency>
- <groupId>xmldb</groupId>
- <artifactId>xmldb-api</artifactId>
- <version>exist-1.2.6</version>
- </dependency>
- <dependency>
- <artifactId>xmlrpc-client</artifactId>
- <groupId>org.apache.xmlrpc</groupId>
- <version>3.0</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>xmldb</groupId>
+ <artifactId>xmldb-api</artifactId>
+ <version>exist-1.2.6</version>
+ </dependency>
+ <dependency>
+ <artifactId>xmlrpc-client</artifactId>
+ <groupId>org.apache.xmlrpc</groupId>
+ <version>3.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>

- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.6</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.6</version>
- </dependency>
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>exist</groupId>
- <artifactId>exist</artifactId>
- <version>1.2.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.santuario</groupId>
- <artifactId>xmlsec</artifactId>
- <version>1.4.6</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-nio</artifactId>
- <version>4.0.1</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>exist</groupId>
+ <artifactId>exist</artifactId>
+ <version>1.2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.santuario</groupId>
+ <artifactId>xmlsec</artifactId>
+ <version>1.4.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-nio</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ </dependency>
+ </dependencies>


- <reporting>
- <excludeDefaults>true</excludeDefaults>
- <outputDirectory>${project.basedir}/doc/site</outputDirectory>
- <plugins>
- <plugin>
- <artifactId>
+ <reporting>
+ <excludeDefaults>true</excludeDefaults>
+ <outputDirectory>${project.basedir}/doc/site</outputDirectory>
+ <plugins>
+ <plugin>
+ <artifactId>
maven-project-info-reports-plugin
</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
-
<report>summary</report>
-
<report>dependencies</report>
-
<report>mailing-list</report>
-
<report>issue-tracking</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- <version>2.4</version>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javancss-maven-plugin</artifactId>
- <configuration>
-
<failOnViolation>false</failOnViolation>
- </configuration>
- <version>2.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <linkXRef>true</linkXRef>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
- </configuration>
- <version>2.7.1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
-
<findbugsXmlOutput>true</findbugsXmlOutput>
- <xmlOutput>true</xmlOutput>
- </configuration>
- </plugin>
- <!--
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-changelog-plugin</artifactId> </plugin>
- -->
- </plugins>
- </reporting>
-
- <distributionManagement>
- <repository>
- <id>geant-developers-repository</id>
- <name>perfSONAR repository</name>
-
<url>scpexe:///repo</url>
- <uniqueVersion>false</uniqueVersion>
- </repository>
- </distributionManagement>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ <report>summary</report>
+ <report>dependencies</report>
+ <report>mailing-list</report>
+ <report>issue-tracking</report>
+ <report>scm</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javancss-maven-plugin</artifactId>
+ <configuration>
+ <failOnViolation>false</failOnViolation>
+ </configuration>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <linkXRef>true</linkXRef>
+ <sourceEncoding>utf-8</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ <version>2.7.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.5.1</version>
+ <configuration>
+ <findbugsXmlOutput>true</findbugsXmlOutput>
+ <xmlOutput>true</xmlOutput>
+ </configuration>
+ </plugin>
+ <!--
+ <plugin> <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changelog-plugin</artifactId> </plugin>
+ -->
+ </plugins>
+ </reporting>
</project>

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2012-12-08 15:42:19
UTC (rev 6063)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2012-12-10 15:49:14
UTC (rev 6064)
@@ -5,28 +5,60 @@

<modelVersion>4.0.0</modelVersion>
<groupId>net.geant.perfsonar</groupId>
- <artifactId>perfsonar-java-rrd-ma</artifactId>
+ <artifactId>perfsonar-java-rrd-ma-SQL_backend</artifactId>
<packaging>war</packaging>
+ <version>3.4.2-SNAPSHOT</version>
+
<name>RRD Measurement Archive</name>
- <version>3.4.1</version>
- <description>Round Robin Database Measurement Archive for
- perfSONAR. For more information see the wiki-page.</description>
+ <description>Round Robin Database Measurement Archive for
PerfSONAR.</description>
<url>http://perfsonar.geant.net/</url>
+ <inceptionYear>2009</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>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<configurationFile>configuration-ma.xml</configurationFile>
<axis2Id>axis2-1.4.1</axis2Id>
<aar.name>${project.artifactId}</aar.name>
- <version.nmwg-sql-converter>1.0.0</version.nmwg-sql-converter>
+
<version.nmwg-sql-converter>1.0.1-SNAPSHOT</version.nmwg-sql-converter>
<deb.version>${project.version}-1</deb.version>
</properties>

+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://issues.geant.net/jira/browse/PSSERVICES</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-ma-SQL_backend</developerConnection>
+ <url>https://svn.geant.net/fisheye/browse/SA2T3-ps-javaservices</url>
+ </scm>
+ <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>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <version>3.0</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -93,7 +125,7 @@

<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
<configuration>
<webResources>
<resource>
@@ -146,7 +178,7 @@

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
<configuration>
<descriptors>

<descriptor>src/main/assembly/packaging.xml</descriptor>
@@ -211,7 +243,8 @@
<goal>jdeb</goal>
</goals>
<configuration>
-
<deb>[[buildDir]]/perfsonar-java-rrd-ma_[[deb.version]]_all.[[extension]]</deb>
+
<deb>[[buildDir]]/perfsonar-java-rrd-ma_[[version]]_all.[[extension]]</deb>
+ <timestamped>true</timestamped>
<dataSet>
<data>

<src>${project.build.directory}/${project.build.finalName}</src>
@@ -263,24 +296,24 @@

<prefix>/usr/share/doc/perfsonar-java-rrd-ma</prefix>
</mapper>
</data>
- <data>
- <src>src/main/sbin/nmwg-sql-converter</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <filemode>755</filemode>
- <prefix>/usr/sbin/</prefix>
- </mapper>
- </data>
- <data>
- <type>template</type>
- <paths>
-
<path>/var/run/perfsonar-java-rrd-ma</path>
- </paths>
- <mapper>
- <type>perm</type>
- </mapper>
- </data>
+ <data>
+
<src>src/main/sbin/nmwg-sql-converter</src>
+ <type>file</type>
+ <mapper>
+ <type>perm</type>
+ <filemode>755</filemode>
+ <prefix>/usr/sbin/</prefix>
+ </mapper>
+ </data>
+ <data>
+ <type>template</type>
+ <paths>
+
<path>/var/run/perfsonar-java-rrd-ma</path>
+ </paths>
+ <mapper>
+ <type>perm</type>
+ </mapper>
+ </data>
</dataSet>
</configuration>
</execution>
@@ -314,25 +347,25 @@
</repository>
</repositories>

- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.6.6</version>
- </dependency>
+ <dependencyManagement>
+ <dependencies>
<dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>xmltooling</artifactId>
- <version>1.1.0</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.6.6</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.6.6</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>xmltooling</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.6.6</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>

<dependencies>
<dependency>
@@ -344,7 +377,7 @@
<dependency>
<groupId>net.geant.perfsonar</groupId>
<artifactId>perfsonar-java-base2</artifactId>
- <version>1.0.7</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.geant.perfsonar</groupId>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-12-08 15:42:19 UTC (rev 6063)
+++ trunk/pom.xml 2012-12-10 15:49:14 UTC (rev 6064)
@@ -29,5 +29,6 @@
<module>perfsonar-java-sql-ma</module>
<module>perfsonar-java-base2</module>
<module>perfsonar-java-rrd-ma-SQL_backend</module>
+ <module>nmwg-sql-converter</module>
</modules>
</project>


  • [pS-dev] [GEANT/SA2/ps-java-services] r6064 - in trunk: . nmwg-sql-converter perfsonar-java-base2 perfsonar-java-rrd-ma-SQL_backend, svn-noreply, 12/10/2012

Archive powered by MHonArc 2.6.16.

Top of Page