Skip to Content.
Sympa Menu

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

Subject: perfsonar development work

List archive

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


Chronological Thread 
  • From:
  • To:
  • Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6066 - in trunk: . nmwg-sql-converter parent perfsonar-java-base2 perfsonar-java-rrd-ma-SQL_backend perfsonar-java-sql-ma perfsonar_base
  • Date: Tue, 11 Dec 2012 11:55:06 +0000 (GMT)

Author: nordunet.behrmann
Date: 2012-12-11 11:55:06 +0000 (Tue, 11 Dec 2012)
New Revision: 6066

Added:
trunk/parent/
trunk/parent/pom.xml
Modified:
trunk/nmwg-sql-converter/pom.xml
trunk/perfsonar-java-base2/pom.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
trunk/perfsonar-java-sql-ma/pom.xml
trunk/perfsonar_base/pom.xml
trunk/pom.xml
Log:
Add Maven parent project

The other projects should inherit from net.geant.perfsonar:parent. The
parent defines common settings like organization, license, GEANT
Artifactory links, etc.

Version numbers and configuration for Maven plugins are defined in the
parent and *should not* be repeated in other projects.

Dependencies are still defined in each sub-project. This is because the
various components have incompatible dependencies and we can thus not
have a common dependencyManagement section in the parent.

Modified: trunk/nmwg-sql-converter/pom.xml
===================================================================
--- trunk/nmwg-sql-converter/pom.xml 2012-12-10 16:02:15 UTC (rev 6065)
+++ trunk/nmwg-sql-converter/pom.xml 2012-12-11 11:55:06 UTC (rev 6066)
@@ -1,51 +1,24 @@
<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/xsd/maven-4.0.0.xsd";>
+ <parent>
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
- <groupId>net.geant.perfsonar</groupId>
<artifactId>nmwg-sql-converter</artifactId>
<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>
- <maven-compiler-plugin.source>1.6</maven-compiler-plugin.source>
- <maven-compiler-plugin.target>1.6</maven-compiler-plugin.target>
- </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>
@@ -55,22 +28,12 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
- <configuration>
- <source>${maven-compiler-plugin.source}</source>
- <target>${maven-compiler-plugin.target}</target>
- </configuration>
- </plugin>
-
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
<configuration>
- <finalName>nmwg-converter</finalName>
<archive>
<manifest>

<mainClass>org.perfsonar.nmwg.converter.Main</mainClass>
@@ -90,25 +53,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.7.1</version>
- <configuration>
- <linkXRef>false</linkXRef>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>${maven-compiler-plugin.target}</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.2</version>
- <configuration>
- <findbugsXmlOutput>true</findbugsXmlOutput>
- <xmlOutput>true</xmlOutput>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
\ No newline at end of file

Added: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml (rev 0)
+++ trunk/parent/pom.xml 2012-12-11 11:55:06 UTC (rev 6066)
@@ -0,0 +1,272 @@
+<?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>
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <maven-compiler-plugin.source>1.6</maven-compiler-plugin.source>
+ <maven-compiler-plugin.target>1.6</maven-compiler-plugin.target>
+ </properties>
+
+ <name>PerfSONAR parent POM</name>
+
+ <prerequisites>
+ <maven>3.0.0</maven>
+ </prerequisites>
+
+ <url>http://perfsonar.geant.net/</url>
+ <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>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</connection>
+
<developerConnection>scm:svn:svn+ssh:///GEANT/SA2/ps-java-services/trunk</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>
+
+ <repositories>
+
+ <repository>
+ <id>geant-repository</id>
+ <name>perfSONAR repository</name>
+ <url>https://artifactory.geant.net/artifactory/repo/</url>
+ </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>
+
+ </repositories>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.0</version>
+ <configuration>
+ <source>${maven-compiler-plugin.source}</source>
+ <target>${maven-compiler-plugin.target}</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <archive>
+ <index>true</index>
+ <manifest>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>jdeb</artifactId>
+ <groupId>org.vafer</groupId>
+ <version>0.11</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12.4</version>
+ <configuration>
+ <forkMode>always</forkMode>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.9.1</version>
+ <executions>
+ <execution>
+ <id>check-style</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>validate</phase>
+ <configuration>
+ <consoleOutput>true</consoleOutput>
+
<logViolationsToConsole>true</logViolationsToConsole>
+ <failsOnError>true</failsOnError>
+ <failOnViolation>true</failOnViolation>
+
<configLocation>src/checkstyle/checkstyle.xml</configLocation>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.7.1</version>
+ <configuration>
+ <linkXRef>false</linkXRef>
+
<sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+
<targetJdk>${maven-compiler-plugin.source}</targetJdk>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.5.2</version>
+ <configuration>
+ <findbugsXmlOutput>true</findbugsXmlOutput>
+ <xmlOutput>true</xmlOutput>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.2</version>
+ </plugin>
+
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <reporting>
+ <excludeDefaults>true</excludeDefaults>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.6</version>
+ <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>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9</version>
+ <reportSets>
+ <reportSet>
+ <id>non-aggregate</id>
+ <reports>
+ <report>javadoc</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </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>
+ <version>2.0</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.7.1</version>
+ <configuration>
+ <linkXRef>false</linkXRef>
+
<sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>${maven-compiler-plugin.source}</targetJdk>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.5.2</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-base2/pom.xml
===================================================================
--- trunk/perfsonar-java-base2/pom.xml 2012-12-10 16:02:15 UTC (rev 6065)
+++ trunk/perfsonar-java-base2/pom.xml 2012-12-11 11:55:06 UTC (rev 6066)
@@ -2,8 +2,14 @@
<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";>

+ <parent>
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
- <groupId>net.geant.perfsonar</groupId>
<artifactId>perfsonar-java-base2</artifactId>
<packaging>jar</packaging>
<version>1.1-SNAPSHOT</version>
@@ -13,20 +19,10 @@
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>
@@ -43,6 +39,7 @@
<skype>blazej980</skype>
</properties>
</developer>
+
<developer>
<id>trzaszcz</id>
<name>Slawomir Trzaszczka</name>
@@ -59,125 +56,35 @@
<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>
- <maven-compiler-plugin.source>1.6</maven-compiler-plugin.source>
- <maven-pmd-plugin.version>2.7.1</maven-pmd-plugin.version>
- <findbugs-maven-plugin.version>2.5.2</findbugs-maven-plugin.version>
- <maven-compiler-plugin.target>1.6</maven-compiler-plugin.target>
- </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-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>

- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
- <configuration>
- <source>${maven-compiler-plugin.source}</source>
- <target>${maven-compiler-plugin.target}</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.12.4</version>
- <configuration>
- <forkMode>always</forkMode>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <archive>
- <index>true</index>
- <manifest>
-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>${maven-pmd-plugin.version}</version>
- <configuration>
- <linkXRef>false</linkXRef>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>${maven-compiler-plugin.target}</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs-maven-plugin.version}</version>
- <configuration>
- <findbugsXmlOutput>true</findbugsXmlOutput>
- <xmlOutput>true</xmlOutput>
- </configuration>
- </plugin>
- </plugins>
- <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>
<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>
- <id>geant-repository</id>
- <name>GEANT repository</name>
- <url>https://artifactory.geant.net/artifactory/repo/</url>
- </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>
@@ -186,31 +93,37 @@

<dependencyManagement>
<dependencies>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.6.6</version>
</dependency>
+
<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.11</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
@@ -222,6 +135,7 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-jaxws</artifactId>
@@ -256,6 +170,7 @@
<artifactId>bcprov-jdk15</artifactId>
<version>1.40</version>
</dependency>
+
<dependency>
<groupId>net.geant2.edugain</groupId>
<artifactId>edugain</artifactId>
@@ -283,11 +198,13 @@
</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>
@@ -299,11 +216,13 @@
</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>
@@ -343,31 +262,37 @@
</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>
@@ -379,6 +304,7 @@
<artifactId>xmldb-api</artifactId>
<version>exist-1.2.6</version>
</dependency>
+
<dependency>
<artifactId>xmlrpc-client</artifactId>
<groupId>org.apache.xmlrpc</groupId>
@@ -396,21 +322,25 @@
<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>
@@ -422,16 +352,19 @@
</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>
@@ -439,74 +372,4 @@
</dependency>
</dependencies>

-
- <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>${maven-pmd-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs-maven-plugin.version}</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-10 16:02:15
UTC (rev 6065)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2012-12-11 11:55:06
UTC (rev 6066)
@@ -3,75 +3,39 @@
<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";>

+ <parent>
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
- <groupId>net.geant.perfsonar</groupId>
<artifactId>perfsonar-java-rrd-ma-SQL_backend</artifactId>
<packaging>war</packaging>
<version>3.4.2-SNAPSHOT</version>

<name>RRD Measurement Archive</name>
<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.1-SNAPSHOT</version.nmwg-sql-converter>
- <maven-pmd-plugin.version>2.7.1</maven-pmd-plugin.version>
- <findbugs-maven-plugin.version>2.5.2</findbugs-maven-plugin.version>
- <maven-compiler-plugin.source>1.6</maven-compiler-plugin.source>
- <maven-compiler-plugin.target>1.6</maven-compiler-plugin.target>
</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>3.0</version>
- <configuration>
- <source>${maven-compiler-plugin.source}</source>
- <target>${maven-compiler-plugin.target}</target>
- </configuration>
- </plugin>
-
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
<id>create-configuration</id>
@@ -128,7 +92,6 @@

<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.3</version>
<configuration>
<webResources>
<resource>
@@ -181,7 +144,6 @@

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

<descriptor>src/main/assembly/packaging.xml</descriptor>
@@ -207,23 +169,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.9.1</version>
- <executions>
- <execution>
- <id>check-style</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>validate</phase>
- <configuration>
- <consoleOutput>true</consoleOutput>
-
<logViolationsToConsole>true</logViolationsToConsole>
- <failsOnError>true</failsOnError>
- <failOnViolation>true</failOnViolation>
-
<configLocation>src/checkstyle/checkstyle.xml</configLocation>
- </configuration>
- </execution>
- </executions>
</plugin>

<!-- execution: mvn -Djetty.port=9999 jetty:run-war -->
@@ -238,7 +183,6 @@
<plugin>
<artifactId>jdeb</artifactId>
<groupId>org.vafer</groupId>
- <version>0.11</version>
<executions>
<execution>
<phase>package</phase>
@@ -323,27 +267,7 @@
</executions>
</plugin>

- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>${maven-pmd-plugin.version}</version>
- <configuration>
- <linkXRef>false</linkXRef>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>${maven-compiler-plugin.source}</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs-maven-plugin.version}</version>
- <configuration>
- <findbugsXmlOutput>true</findbugsXmlOutput>
- <xmlOutput>true</xmlOutput>
- </configuration>
- </plugin>
</plugins>
-
</build>

<repositories>
@@ -370,26 +294,31 @@
</repositories>

<dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.6.6</version>
</dependency>
+
<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>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -401,17 +330,20 @@
<artifactId>perfsonar-java-base2</artifactId>
<version>1.1-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>net.geant.perfsonar</groupId>
<artifactId>nmwg-sql-converter</artifactId>
<version>${version.nmwg-sql-converter}</version>
<classifier>jar-with-dependencies</classifier>
</dependency>
+
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>3.4.0</version>
</dependency>
+
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
@@ -424,75 +356,24 @@
<artifactId>hibernate-entitymanager</artifactId>
<version>4.1.6.Final</version>
</dependency>
+
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-c3p0</artifactId>
<version>4.1.6.Final</version>
</dependency>
+
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
<version>1.0.1.Final</version>
</dependency>
+
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.21</version>
</dependency>
- </dependencies>

- <reporting>
- <excludeDefaults>true</excludeDefaults>
- <outputDirectory>${project.basedir}/doc/site</outputDirectory>
- <plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.4</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- <report>summary</report>
- <report>project-team</report>
- <report>dependencies</report>
- <report>mailing-list</report>
- <report>issue-tracking</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- </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>
- <version>2.0</version>
- <artifactId>javancss-maven-plugin</artifactId>
- <configuration>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.7.1</version>
- <configuration>
- <linkXRef>true</linkXRef>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>${maven-compiler-plugin.target}</targetJdk>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
+ </dependencies>
</project>

Modified: trunk/perfsonar-java-sql-ma/pom.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/pom.xml 2012-12-10 16:02:15 UTC (rev 6065)
+++ trunk/perfsonar-java-sql-ma/pom.xml 2012-12-11 11:55:06 UTC (rev 6066)
@@ -1,98 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
+ <parent>
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
<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>
- <maven-compiler-plugin.source>1.6</maven-compiler-plugin.source>
- <maven-pmd-plugin.version>2.7.1</maven-pmd-plugin.version>
- <findbugs-maven-plugin.version>2.5.2</findbugs-maven-plugin.version>
</properties>

<name>SQL Measurement Archive</name>
<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>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-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>

<build>
<finalName>geant2-java-sql-ma</finalName>
<plugins>
+
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
- <configuration>
- <source>${maven-compiler-plugin.source}</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.9.1</version>
- <executions>
- <execution>
- <id>check-style</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>validate</phase>
- <configuration>
- <consoleOutput>true</consoleOutput>
-
<logViolationsToConsole>true</logViolationsToConsole>
- <failsOnError>true</failsOnError>
- <failOnViolation>true</failOnViolation>
-
<configLocation>src/checkstyle/checkstyle.xml</configLocation>
- </configuration>
- </execution>
- </executions>
</plugin>
+
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.9</version>
</plugin>
+
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.3</version>
<executions>
<execution>
<phase>package</phase>
@@ -106,7 +54,6 @@
<plugin>
<artifactId>jdeb</artifactId>
<groupId>org.vafer</groupId>
- <version>0.11</version>
<executions>
<execution>
<phase>package</phase>
@@ -173,108 +120,95 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>${maven-pmd-plugin.version}</version>
- <configuration>
- <linkXRef>false</linkXRef>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>${maven-compiler-plugin.source}</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs-maven-plugin.version}</version>
- <configuration>
- <findbugsXmlOutput>true</findbugsXmlOutput>
- <xmlOutput>true</xmlOutput>
- </configuration>
- </plugin>
</plugins>
</build>
+
<repositories>
+
<repository>
- <id>geant-repository</id>
- <name>perfSONAR repository</name>
- <url>https://artifactory.geant.net/artifactory/repo/</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.opensaml</groupId>
<artifactId>xmltooling</artifactId>
<version>1.1.0</version>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl104-over-slf4j</artifactId>
<version>${slf4j.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
</dependency>
+
</dependencies>
</dependencyManagement>

<dependencies>
+
<dependency>
<groupId>net.geant.perfsonar</groupId>
<artifactId>perfsonar_base</artifactId>
<version>1.1.3-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>net.geant.perfsonar</groupId>
<artifactId>perfsonar-web-admin</artifactId>
<version>0.9.3c</version>
</dependency>
+
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.3.2</version>
</dependency>
+
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.3</version>
</dependency>
+
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.2</version>
</dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.21</version>
</dependency>
+
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>9.1-901.jdbc4</version>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -305,68 +239,7 @@
<artifactId>flyway-core</artifactId>
<version>2.0.3</version>
</dependency>
+
</dependencies>
- <reporting>
- <excludeDefaults>true</excludeDefaults>
- <outputDirectory>${project.basedir}/doc/site</outputDirectory>
- <plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.4</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- <report>summary</report>
- <report>project-team</report>
- <report>dependencies</report>
- <report>mailing-list</report>
- <report>issue-tracking</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.3</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.2</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javancss-maven-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>${maven-pmd-plugin.version}</version>
- <configuration>
- <linkXRef>true</linkXRef>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>${maven-compiler-plugin.source}</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs-maven-plugin.version}</version>
- <configuration>
- <findbugsXmlOutput>true</findbugsXmlOutput>
- <xmlOutput>true</xmlOutput>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
+
</project>

Modified: trunk/perfsonar_base/pom.xml
===================================================================
--- trunk/perfsonar_base/pom.xml 2012-12-10 16:02:15 UTC (rev 6065)
+++ trunk/perfsonar_base/pom.xml 2012-12-11 11:55:06 UTC (rev 6066)
@@ -1,20 +1,22 @@
<?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";>
+ <parent>
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
<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>
- <maven-pmd-plugin.version>2.7.1</maven-pmd-plugin.version>
- <maven-compiler-plugin.source>1.6</maven-compiler-plugin.source>
- <findbugs-maven-plugin.version>2.5.2</findbugs-maven-plugin.version>
</properties>

<name>Perfsonar Base package</name>
@@ -22,147 +24,70 @@
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>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_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>
- <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>3.0</version>
- <configuration>
- <source>${maven-compiler-plugin.source}</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.9.1</version>
- <executions>
- <execution>
- <id>check-style</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>validate</phase>
- <configuration>
- <consoleOutput>true</consoleOutput>
-
<logViolationsToConsole>true</logViolationsToConsole>
- <failsOnError>true</failsOnError>
- <failOnViolation>true</failOnViolation>
-
<configLocation>src/checkstyle/checkstyle.xml</configLocation>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>${maven-pmd-plugin.version}</version>
- <configuration>
- <linkXRef>false</linkXRef>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>${maven-compiler-plugin.source}</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs-maven-plugin.version}</version>
- <configuration>
- <findbugsXmlOutput>true</findbugsXmlOutput>
- <xmlOutput>true</xmlOutput>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<repositories>
+
<repository>
<id>codehaus-release-repo</id>
<name>Codehaus Release Repo</name>
<url>http://repository.codehaus.org</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>
- <id>geant-repository</id>
- <name>perfSONAR repository</name>
- <url>https://artifactory.geant.net/artifactory/repo/</url>
- </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>
+
</repositories>

+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencyManagement>
<dependencies>
+
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>xmltooling</artifactId>
<version>1.1.0</version>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
</dependency>
+
</dependencies>
</dependencyManagement>

<dependencies>
+
<dependency>
<groupId>net.geant.perfsonar</groupId>
<artifactId>nmwg</artifactId>
<version>1.0.20090304</version>
</dependency>
+
<dependency>
<groupId>net.geant.perfsonar</groupId>
<artifactId>perfsonar-authr</artifactId>
@@ -180,16 +105,19 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-local</artifactId>
<version>${axis2.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
<version>${axis2.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb</artifactId>
@@ -201,21 +129,25 @@
<artifactId>axis</artifactId>
<version>${axis1.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.axis</groupId>
<artifactId>axis-jaxrpc</artifactId>
<version>${axis1.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.axis</groupId>
<artifactId>axis-saaj</artifactId>
<version>${axis1.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.axis</groupId>
<artifactId>axis-ant</artifactId>
<version>${axis1.version}</version>
</dependency>
+
<dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
@@ -227,27 +159,32 @@
<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>jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.0b8</version>
</dependency>
+
<dependency>
<groupId>urbanophile</groupId>
<artifactId>java-getopt</artifactId>
<version>1.0.9</version>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.xalan</groupId>
<artifactId>xalan</artifactId>
@@ -265,6 +202,7 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
@@ -280,11 +218,13 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2</version>
</dependency>
+
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
@@ -296,6 +236,7 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
@@ -317,6 +258,7 @@
<artifactId>geronimo-activation_1.1_spec</artifactId>
<version>1.1</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
@@ -334,21 +276,25 @@
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
@@ -360,11 +306,13 @@
<artifactId>xmldb-api</artifactId>
<version>exist-1.2.6</version>
</dependency>
+
<dependency>
<groupId>exist</groupId>
<artifactId>exist</artifactId>
<version>1.2.6</version>
</dependency>
+
<dependency>
<artifactId>xmlrpc-client</artifactId>
<groupId>org.apache.xmlrpc</groupId>
@@ -388,16 +336,19 @@
<artifactId>xml-security</artifactId>
<version>1.4.1</version>
</dependency>
+
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
<version>1.40</version>
</dependency>
+
<dependency>
<groupId>wss4j</groupId>
<artifactId>wss4j</artifactId>
<version>1.5.1</version>
</dependency>
+
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId>
@@ -413,6 +364,7 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>xmltooling</artifactId>
@@ -424,6 +376,7 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml1</artifactId>
@@ -447,16 +400,19 @@
<artifactId>saxon</artifactId>
<version>8.7</version>
</dependency>
+
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>saxon-jdom</artifactId>
<version>8.7</version>
</dependency>
+
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>saxon-dom</artifactId>
<version>8.7</version>
</dependency>
+
<dependency>
<groupId>net.geant2.edugain</groupId>
<artifactId>edugain</artifactId>
@@ -485,71 +441,6 @@
</exclusion>
</exclusions>
</dependency>
+
</dependencies>
- <reporting>
- <excludeDefaults>true</excludeDefaults>
- <outputDirectory>${project.basedir}/doc/site</outputDirectory>
- <plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.4</version>
- <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>
- </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>
- <version>2.0</version>
- <configuration>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>${maven-pmd-plugin.version}</version>
- <configuration>
- <linkXRef>true</linkXRef>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>${maven-compiler-plugin.source}</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs-maven-plugin.version}</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/pom.xml
===================================================================
--- trunk/pom.xml 2012-12-10 16:02:15 UTC (rev 6065)
+++ trunk/pom.xml 2012-12-11 11:55:06 UTC (rev 6066)
@@ -25,6 +25,7 @@
</organization>

<modules>
+ <module>parent</module>
<module>perfsonar_base</module>
<module>perfsonar-java-sql-ma</module>
<module>perfsonar-java-base2</module>



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

Archive powered by MHonArc 2.6.16.

Top of Page