From 143591ed9887e1cc61669b42dc4ec06d49cf4568 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tdonohue@duraspace.org>
Date: Thu, 18 Oct 2012 14:07:29 -0500
Subject: [PATCH] Cleanup POM Dependencies.  Remove dependeny <version> tags
 from submodule POMs when the version is already specified by dspace-parent
 POM.  Also ensure all 'servlet-api' dependencies have a
 <scope>provided</scope> as they should.

---
 dspace-oai/pom.xml               | 1 +
 dspace-services/pom.xml          | 6 ------
 dspace-sword/pom.xml             | 7 +------
 dspace-swordv2/pom.xml           | 1 -
 dspace-xmlui/pom.xml             | 2 --
 dspace/modules/additions/pom.xml | 1 +
 dspace/modules/oai/pom.xml       | 1 -
 dspace/modules/solr/pom.xml      | 1 -
 dspace/pom.xml                   | 2 +-
 9 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/dspace-oai/pom.xml b/dspace-oai/pom.xml
index b843ce60d8..7f1cc42fdf 100644
--- a/dspace-oai/pom.xml
+++ b/dspace-oai/pom.xml
@@ -89,6 +89,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/dspace-services/pom.xml b/dspace-services/pom.xml
index a6d7cce6da..dc1e61088e 100644
--- a/dspace-services/pom.xml
+++ b/dspace-services/pom.xml
@@ -29,7 +29,6 @@
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <version>2.4</version>
         </dependency>
         <!-- this needs to eventually go into common/lib for tomcat 5 -->
         <dependency>
@@ -42,14 +41,12 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
             <scope>provided</scope>
         </dependency>
         <!-- SPECIAL CASE - need JUNIT at build time and testing time -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.5</version>
             <scope>provided</scope>
         </dependency>
         <!-- testing only -->
@@ -73,20 +70,17 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.14</version>
         </dependency>
         <dependency>
             <!-- needed to ensure that all JCL is 1.1.1 -->
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1.1</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
-            <version>3.2</version>
         </dependency>
     </dependencies>
 
diff --git a/dspace-sword/pom.xml b/dspace-sword/pom.xml
index 2d7fd83716..1428afc47c 100644
--- a/dspace-sword/pom.xml
+++ b/dspace-sword/pom.xml
@@ -105,28 +105,24 @@
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-            <version>1.2</version>
         </dependency>
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.15</version>
             <exclusions>
                 <exclusion>
                     <artifactId>jmxtools</artifactId>
@@ -150,7 +146,6 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>1.3.1</version>
         </dependency>
     </dependencies>
 
diff --git a/dspace-swordv2/pom.xml b/dspace-swordv2/pom.xml
index bbda7e08c1..781ad114dc 100644
--- a/dspace-swordv2/pom.xml
+++ b/dspace-swordv2/pom.xml
@@ -113,7 +113,6 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.15</version>
             <exclusions>
                 <exclusion>
                     <artifactId>jmxtools</artifactId>
diff --git a/dspace-xmlui/pom.xml b/dspace-xmlui/pom.xml
index c3ba0533b6..71bb80a258 100644
--- a/dspace-xmlui/pom.xml
+++ b/dspace-xmlui/pom.xml
@@ -96,7 +96,6 @@
         <dependency>
             <groupId>jdom</groupId>
             <artifactId>jdom</artifactId>
-            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cocoon</groupId>
@@ -205,7 +204,6 @@
         <dependency>
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
-            <version>1.3.1</version>
         </dependency>
         <dependency>
             <groupId>net.sf.opencsv</groupId>
diff --git a/dspace/modules/additions/pom.xml b/dspace/modules/additions/pom.xml
index 35689549d7..8d6beea9f4 100644
--- a/dspace/modules/additions/pom.xml
+++ b/dspace/modules/additions/pom.xml
@@ -78,6 +78,7 @@
       <dependency>
          <groupId>javax.servlet</groupId>
          <artifactId>servlet-api</artifactId>
+         <scope>provided</scope>
       </dependency>
       <dependency>
          <groupId>ant-contrib</groupId>
diff --git a/dspace/modules/oai/pom.xml b/dspace/modules/oai/pom.xml
index 86e178e6b0..d83b2b7935 100644
--- a/dspace/modules/oai/pom.xml
+++ b/dspace/modules/oai/pom.xml
@@ -85,7 +85,6 @@
         <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>dspace-oai</artifactId>
-            <version>3.0-rc2-SNAPSHOT</version>
             <type>jar</type>
             <classifier>classes</classifier>
         </dependency>
diff --git a/dspace/modules/solr/pom.xml b/dspace/modules/solr/pom.xml
index d8215015dd..ceac391417 100644
--- a/dspace/modules/solr/pom.xml
+++ b/dspace/modules/solr/pom.xml
@@ -70,7 +70,6 @@
        <dependency>
            <groupId>xalan</groupId>
            <artifactId>xalan</artifactId>
-           <version>2.7.0</version>
        </dependency>
 
    </dependencies>
diff --git a/dspace/pom.xml b/dspace/pom.xml
index 10bc775026..ac341514e8 100644
--- a/dspace/pom.xml
+++ b/dspace/pom.xml
@@ -93,7 +93,7 @@
     	<dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
+            <scope>provided</scope>
     	</dependency>
     </dependencies>
 </project>