Skip to Content.
Sympa Menu

perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6347 - in trunk: parent perfsonar-java-sql-ma perfsonar_base

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/ps-java-services] r6347 - in trunk: parent perfsonar-java-sql-ma perfsonar_base


Chronological Thread 
  • From:
  • To:
  • Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6347 - in trunk: parent perfsonar-java-sql-ma perfsonar_base
  • Date: Fri, 3 May 2013 21:57:44 +0100 (BST)
  • Authentication-results: sfpop-ironport04.merit.edu; dkim=neutral (message not signed) header.i=none
Author: dante.delvaux
Date: 2013-05-03 21:57:44 +0100 (Fri, 03 May 2013)
New Revision: 6347

Modified:
trunk/parent/pom.xml
trunk/perfsonar-java-sql-ma/pom.xml
trunk/perfsonar_base/pom.xml
Log:
pSbase1 adn SQL MA: simplifying dependency management and rely only on geant
repository for 3rd party packages.

Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml 2013-05-03 10:52:19 UTC (rev 6346)
+++ trunk/parent/pom.xml 2013-05-03 20:57:44 UTC (rev 6347)
@@ -127,7 +127,7 @@

<url>https://artifactory.geant.net/artifactory/repo/net/geant/3rdparty</url>
</repository>

- <!-- XMLDog, see http://code.google.com/p/jlibs/wiki/XMLDog -->
+ <!-- XMLDog is required by pSbase3, see
http://code.google.com/p/jlibs/wiki/XMLDog -->
<repository>
<id>jlibs-repository</id>
<name>JLibs Repository</name>

Modified: trunk/perfsonar-java-sql-ma/pom.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/pom.xml 2013-05-03 10:52:19 UTC (rev 6346)
+++ trunk/perfsonar-java-sql-ma/pom.xml 2013-05-03 20:57:44 UTC (rev 6347)
@@ -14,8 +14,8 @@
<packaging>war</packaging>

<properties>
- <slf4j.version>1.6.6</slf4j.version>
- <installName>geant2-java-sql-ma</installName>
+ <slf4j.version>1.7.5</slf4j.version> <!-- Needs to be aligned with
the parent/pom.xml -->
+ <installName>geant2-java-sql-ma</installName> <!-- TODO: needs to
be changed -->
<installPath>/usr/lib/perfsonar/services/${installName}</installPath>
</properties>

@@ -32,19 +32,11 @@
<build>
<finalName>${installName}</finalName>
<plugins>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
-
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.9</version>
- </plugin>
-
- <plugin>
<artifactId>maven-war-plugin</artifactId>
<executions>
<execution>
@@ -58,39 +50,12 @@
</plugins>
</build>

- <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>
@@ -118,7 +83,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
<scope>provided</scope>
</dependency>

@@ -135,13 +99,6 @@
</dependency>

<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>com.jolbox</groupId>
<artifactId>bonecp</artifactId>
<version>0.7.1.RELEASE</version>
@@ -165,6 +122,12 @@
<version>2.0.3</version>
</dependency>

+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>

<profiles>

Modified: trunk/perfsonar_base/pom.xml
===================================================================
--- trunk/perfsonar_base/pom.xml 2013-05-03 10:52:19 UTC (rev 6346)
+++ trunk/perfsonar_base/pom.xml 2013-05-03 20:57:44 UTC (rev 6347)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.geant.perfsonar</groupId>
<artifactId>parent</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

@@ -16,7 +16,7 @@
<properties>
<axis2.version>1.6.2</axis2.version>
<axis1.version>1.4</axis1.version>
- <slf4j.version>1.6.6</slf4j.version>
+ <slf4j.version>1.7.5</slf4j.version> <!-- Needs to be aligned with
the parent/pom.xml -->
</properties>

<name>perfSONAR base 1</name>
@@ -29,22 +29,6 @@

<url>https://svn.geant.net/fisheye/browse/SA2T3-ps-java-services/trunk/perfsonar_base/</url>
</scm>

- <repositories>
-
- <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>
-
- </repositories>
-
<build>
<plugins>
<plugin>
@@ -54,24 +38,6 @@
</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>
@@ -79,7 +45,6 @@
<artifactId>nmwg</artifactId>
<version>1.0.20090304</version>
</dependency>
-
<dependency>
<groupId>net.geant.perfsonar</groupId>
<artifactId>perfsonar-authr</artifactId>
@@ -90,44 +55,17 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
<version>${axis2.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </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>
- <version>${axis2.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.axis</groupId>
<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>
@@ -135,160 +73,35 @@
</dependency>

<dependency>
- <groupId>org.apache.axis</groupId>
- <artifactId>axis-ant</artifactId>
- <version>${axis1.version}</version>
- </dependency>
-
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>1.6.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.xerces</groupId>
+ <groupId>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>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>
+ <groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.7.1</version>
</dependency>

<dependency>
- <groupId>commons-discovery</groupId>
- <artifactId>commons-discovery</artifactId>
- <version>0.2</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.1</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </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>
- <version>1.7.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>1.7</version>
- <exclusions>
- <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.geronimo.specs</groupId>
- <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>
- <version>1.7.1</version>
- </dependency>
-
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
</dependency>

<dependency>
<groupId>log4j</groupId>
<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>
<version>${slf4j.version}</version>
</dependency>
@@ -300,36 +113,6 @@
</dependency>

<dependency>
- <groupId>exist</groupId>
- <artifactId>exist</artifactId>
- <version>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>antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>2.7.7</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.xml.security</groupId>
- <artifactId>xml-security</artifactId>
- <version>1.4.1</version>
- </dependency>
-
- <dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
<version>1.40</version>
@@ -343,32 +126,23 @@

<dependency>
<groupId>org.opensaml</groupId>
- <artifactId>opensaml</artifactId>
- <version>2.1.0</version>
+ <artifactId>xmltooling</artifactId>
+ <version>1.3.4</version>
<exclusions>
<exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
+ <artifactId>xml-apis</artifactId>
+ <groupId>org.apache.xerces</groupId>
</exclusion>
<exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
+ <artifactId>xercesImpl</artifactId>
+ <groupId>org.apache.xerces</groupId>
</exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>xmltooling</artifactId>
- <version>1.1.0</version>
- <exclusions>
<exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
+ <artifactId>serializer</artifactId>
+ <groupId>org.apache.xerces</groupId>
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml1</artifactId>
@@ -394,45 +168,35 @@
</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>
<version>1.0-RC4</version>
<optional>false</optional>
<exclusions>
<exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>xml-apis</artifactId>
+ <groupId>org.apache.xerces</groupId>
</exclusion>
<exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
+ <artifactId>serializer</artifactId>
+ <groupId>org.apache.xerces</groupId>
</exclusion>
<exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <artifactId>resolver</artifactId>
+ <groupId>org.apache.xerces</groupId>
</exclusion>
<exclusion>
- <groupId>opensaml</groupId>
- <artifactId>opensaml</artifactId>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
</exclusion>
- <exclusion>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </exclusion>
</exclusions>
</dependency>

+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>


  • [pS-dev] [GEANT/SA2/ps-java-services] r6347 - in trunk: parent perfsonar-java-sql-ma perfsonar_base, svn-noreply, 05/03/2013

Archive powered by MHonArc 2.6.16.

Top of Page