perfsonar development work

Author: nordunet.behrmann
Date: 2012-11-27 11:17:20 +0000 (Tue, 27 Nov 2012)
New Revision: 6038

Modified:
   trunk/perfsonar-java-sql-ma/pom.xml
Log:
perfsonar-java-sql-ma: Update dependencies

jar-repository was deleted in a recent cleanup of SVN. SQL MA has
failed to compile since then, as external dependencies were missing.

This commit updates the repository references and dependencies to
allow SQL MA to be compiled.



Modified: trunk/perfsonar-java-sql-ma/pom.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/pom.xml 2012-11-27 11:15:25 UTC (rev 6037)
+++ trunk/perfsonar-java-sql-ma/pom.xml 2012-11-27 11:17:20 UTC (rev 6038)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>perfsonar</groupId>
-    <artifactId>geant2-java-sql-ma</artifactId>
+    <groupId>net.geant2.perfsonar</groupId>
+    <artifactId>perfsonar-java-sql-ma</artifactId>
     <packaging>war</packaging>
     <name>SQL Measurement Archive</name>
-    <version>2.3.1</version>
+    <version>2.3.2</version>
     <description>Relational Database Measurement Archive for
         perfSONAR. For more information see the wiki-page.</description>
     
<url>http://wiki.perfsonar.net/jra1-wiki/index.php/PerfSONAR_Java_SQL_MA_release_candidate</url>
@@ -209,14 +209,9 @@
     </build>
     <repositories>
         <repository>
-            <id>personar</id>
-            <name>personar repository</name>
-            
<url>http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/jar-repository</url>
-        </repository>
-        <repository>
             <id>geant-repository</id>
             <name>perfSONAR repository</name>
-            <url>https://artifactory.geant.net/artifactory/geant-repo/</url>
+            <url>https://artifactory.geant.net/artifactory/repo/</url>
         </repository>
         <repository>
             <id>codehaus-release-repo</id>
@@ -224,14 +219,35 @@
             <url>http://repository.codehaus.org</url>
         </repository>
     </repositories>
-    <dependencies>
+
+    <dependencyManagement>
+       <dependencies>
         <dependency>
-            <groupId>perfsonar</groupId>
-            <artifactId>perfsonar-base</artifactId>
+            <groupId>org.opensaml</groupId>
+            <artifactId>xmltooling</artifactId>
             <version>1.1.0</version>
         </dependency>
+       <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>jcl104-over-slf4j</artifactId>
+         <version>1.5.2</version>
+       </dependency>
+       <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-simple</artifactId>
+         <version>1.5.2</version>
+       </dependency>
+       </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
         <dependency>
-            <groupId>perfsonar</groupId>
+            <groupId>net.geant2.perfsonar</groupId>
+            <artifactId>perfsonar_base</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>net.geant2.perfsonar</groupId>
             <artifactId>perfsonar-web-admin</artifactId>
             <version>0.9.3c</version>
         </dependency>
@@ -257,7 +273,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.ibatis</groupId>
+            <groupId>net.geant2.perfsonar</groupId>
             <artifactId>ibatis-sqlmap</artifactId>
             <version>2.1.7.597</version>
         </dependency>