[libshib-common-java] 01/06: POM changes not readily expressable as maven rules

[Matthew Vernon]

This is an automated email from the git hooks/post-receive script.

matthew pushed a commit to branch master
in repository libshib-common-java.

commit bbba4d40863079d7d1d85d50a086f10ecec01064
Author: Matthew Vernon <mcv21 at cam.ac.uk>
Date:   Wed Mar 5 16:28:10 2014 +0000

    POM changes not readily expressable as maven rules
    
    These changes make building this package with maven easier.
---
 pom.xml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index cdb9517..32ff193 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.shibboleth</groupId>
         <artifactId>parent-v2</artifactId>
-        <version>1</version>
+        <version>debian</version>
     </parent>
 
     <groupId>edu.internet2.middleware</groupId>
@@ -90,9 +90,9 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>${spring.groupId}</groupId>
+            <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
-            <version>${spring.version}</version>
+            <version>3.x</version>
             <exclusions>
                 <exclusion>
                     <artifactId>aopalliance</artifactId>
@@ -117,9 +117,9 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>${spring.groupId}</groupId>
+            <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>${spring.version}</version>
+            <version>3.x</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
@@ -143,6 +143,7 @@
         <dependency>
             <groupId>javax.mail</groupId>
             <artifactId>mail</artifactId>
+	    <version>debian</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.janino</groupId>
@@ -182,23 +183,26 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>${xerces.groupId}</groupId>
+            <groupId>xml-apis</groupId>
             <artifactId>xml-apis</artifactId>
+	    <version>debian</version>
         </dependency>
         <dependency>
-            <groupId>${xerces.groupId}</groupId>
+            <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
+	    <version>debian</version>
         </dependency>
         <dependency>
-            <groupId>${xerces.groupId}</groupId>
+            <groupId>xalan</groupId>
             <artifactId>serializer</artifactId>
+	    <version>debian</version>
         </dependency>
         <dependency>
             <groupId>xml-resolver</groupId>
             <artifactId>xml-resolver</artifactId>
         </dependency>
         <dependency>
-            <groupId>${xalan.groupId}</groupId>
+            <groupId>xalan</groupId>
             <artifactId>xalan</artifactId>
         </dependency>
 
@@ -206,6 +210,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+	    <version>3.x</version>
         </dependency>
         <dependency>
             <groupId>hsqldb</groupId>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libshib-common-java.git