perfsonar development work

Author: nordunet.behrmann
Date: 2012-12-04 15:07:27 +0000 (Tue, 04 Dec 2012)
New Revision: 6053

Modified:
   trunk/perfsonar-java-sql-ma/pom.xml
   trunk/perfsonar_base/pom.xml
Log:
perfsonar_base, perfsonar-java-sql-ma: Minor restructuring of Maven project 
files

- Moved slf4j dependencies to base
- Use properties for version numbers used multiple times
- Upgrade compiler plugin
- Upgrade junit

Modified: trunk/perfsonar-java-sql-ma/pom.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/pom.xml 2012-12-04 15:07:27 UTC (rev 6052)
+++ trunk/perfsonar-java-sql-ma/pom.xml 2012-12-04 15:07:27 UTC (rev 6053)
@@ -30,6 +30,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <deb.version>${project.version}-1</deb.version>
+        <slf4j.version>1.5.10</slf4j.version>
     </properties>
 
     <build>
@@ -37,7 +38,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>
@@ -168,12 +169,12 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jcl104-over-slf4j</artifactId>
-                <version>1.5.10</version>
+                <version>${slf4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-simple</artifactId>
-                <version>1.5.10</version>
+                <version>${slf4j.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -207,7 +208,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
+            <version>2.5</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -223,7 +224,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.4</version>
+            <version>4.11</version>
             <scope>test</scope>
         </dependency>
 
@@ -238,12 +239,6 @@
             <artifactId>spring-jdbc</artifactId>
             <version>3.1.3.RELEASE</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.5.10</version>
-        </dependency>
     </dependencies>
     <reporting>
         <excludeDefaults>true</excludeDefaults>

Modified: trunk/perfsonar_base/pom.xml
===================================================================
--- trunk/perfsonar_base/pom.xml        2012-12-04 15:07:27 UTC (rev 6052)
+++ trunk/perfsonar_base/pom.xml        2012-12-04 15:07:27 UTC (rev 6053)
@@ -30,7 +30,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>
@@ -99,17 +99,19 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jcl104-over-slf4j</artifactId>
-                <version>1.5.10</version>
+                <version>${slf4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-simple</artifactId>
-                <version>1.5.10</version>
+                <version>${slf4j.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
     <properties>
         <axis2.version>1.6.2</axis2.version>
+        <axis1.version>1.4</axis1.version>
+        <slf4j.version>1.5.10</slf4j.version>
     </properties>
 
     <dependencies>
@@ -154,22 +156,22 @@
         <dependency>
             <groupId>org.apache.axis</groupId>
             <artifactId>axis</artifactId>
-            <version>1.4</version>
+            <version>${axis1.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.axis</groupId>
             <artifactId>axis-jaxrpc</artifactId>
-            <version>1.4</version>
+            <version>${axis1.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.axis</groupId>
             <artifactId>axis-saaj</artifactId>
-            <version>1.4</version>
+            <version>${axis1.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.axis</groupId>
             <artifactId>axis-ant</artifactId>
-            <version>1.4</version>
+            <version>${axis1.version}</version>
         </dependency>
         <dependency>
             <groupId>wsdl4j</groupId>
@@ -200,7 +202,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.10</version>
+            <version>4.11</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -292,8 +294,13 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>1.5.2</version>
+            <version>${slf4j.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl104-over-slf4j</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>xmldb</groupId>