perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r5951 - in trunk: perfsonar-java-base2 perfsonar-java-rrd-ma-SQL_backend
Subject: perfsonar development work
List archive
[pS-dev] [GEANT/SA2/ps-java-services] r5951 - in trunk: perfsonar-java-base2 perfsonar-java-rrd-ma-SQL_backend
Chronological Thread
- From:
- To:
- Subject: [pS-dev] [GEANT/SA2/ps-java-services] r5951 - in trunk: perfsonar-java-base2 perfsonar-java-rrd-ma-SQL_backend
- Date: Thu, 16 Aug 2012 08:06:12 +0100 (BST)
Author: nordunet.behrmann
Date: 2012-08-16 08:06:12 +0100 (Thu, 16 Aug 2012)
New Revision: 5951
Modified:
trunk/perfsonar-java-base2/pom.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
Log:
Adjust Maven dependencies to new locations
Several repositories have moven. The patch updates the references to
those repositories.
Also excluded an old unavailable version of bouncycastle from being
included - it would have conflicted with the explicit inclusion of
a different version anyway.
Modified: trunk/perfsonar-java-base2/pom.xml
===================================================================
--- trunk/perfsonar-java-base2/pom.xml 2012-08-14 17:51:31 UTC (rev 5950)
+++ trunk/perfsonar-java-base2/pom.xml 2012-08-16 07:06:12 UTC (rev 5951)
@@ -103,7 +103,7 @@
<repository>
<id>geant-repository</id>
<name>GEANT repository</name>
- <url>http://maven.geant.net/repo/net/geant/3rdparty</url>
+
<url>https://artifactory.geant.net/artifactory/geant-repo/net/geant/3rdparty/</url>
</repository>
<repository>
<id>perfsonar-old-repo</id>
@@ -228,8 +228,8 @@
</dependency>
<dependency>
- <groupId>exist</groupId>
- <artifactId>xmldb</artifactId>
+ <groupId>xmldb</groupId>
+ <artifactId>xmldb-api</artifactId>
<version>exist-1.2.6</version>
</dependency>
<dependency>
Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2012-08-14 17:51:31
UTC (rev 5950)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2012-08-16 07:06:12
UTC (rev 5951)
@@ -179,7 +179,7 @@
<repository>
<id>ibiblio</id>
<name>ibiblio repository</name>
- <url>http://www.ibiblio.org/maven2</url>
+
<url>http://mirrors.ibiblio.org/pub/mirrors/maven2/</url>
</repository>
<repository>
<id>personar</id>
@@ -200,7 +200,7 @@
<repository>
<id>geant-repository</id>
<name>perfSONAR repository</name>
- <url>http://maven.geant.net/repo</url>
+
<url>https://artifactory.geant.net/artifactory/geant-repo/</url>
</repository>
</repositories>
@@ -248,7 +248,7 @@
<dependency>
<groupId>net.geant.perfsonar</groupId>
<artifactId>ps-mdm-base2</artifactId>
- <version>1.0.5</version>
+ <version>1.0.6</version>
</dependency>
<dependency>
<groupId>rrdjtool</groupId>
@@ -306,6 +306,20 @@
<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>
+ </exclusions>
</dependency>
<dependency>
<groupId>xerces</groupId>
- [pS-dev] [GEANT/SA2/ps-java-services] r5951 - in trunk: perfsonar-java-base2 perfsonar-java-rrd-ma-SQL_backend, svn-noreply, 08/16/2012
Archive powered by MHonArc 2.6.16.