From b4a55a70115d889d788f11320f53fce326b04fe4 Mon Sep 17 00:00:00 2001
From: Stuart Lewis <stuart@stuartlewis.com>
Date: Mon, 22 Mar 2010 21:52:50 +0000
Subject: [PATCH] [DS-518] Duplicate listing of dependencies in
 dspace-sword/pom.xml

git-svn-id: http://scm.dspace.org/svn/repo/dspace/branches/dspace-1_6_x@4827 9c30dcfa-912a-0410-8fc2-9e0234be79fd
---
 dspace-sword/dspace-sword-api/pom.xml | 159 ++++++++++++--------------
 dspace/CHANGES                        |   3 +
 2 files changed, 73 insertions(+), 89 deletions(-)

diff --git a/dspace-sword/dspace-sword-api/pom.xml b/dspace-sword/dspace-sword-api/pom.xml
index 11652e5a74..107b14b421 100644
--- a/dspace-sword/dspace-sword-api/pom.xml
+++ b/dspace-sword/dspace-sword-api/pom.xml
@@ -49,99 +49,80 @@
 
    <dependencies>
 
-      <!-- Leave this out for the moment, as the source is in the tree -->
-      <!--
+       <!-- Leave this out for the moment, as the source is in the tree -->
+       <!--
+          <dependency>
+          <groupId>org.dspace</groupId>
+          <artifactId>sword-common</artifactId>
+          <version>1.0.0</version>
+          </dependency>-->
+
          <dependency>
-         <groupId>org.dspace</groupId>
-         <artifactId>sword-common</artifactId>
-         <version>1.0.0</version>
-         </dependency>-->
+             <groupId>org.dspace</groupId>
+             <artifactId>dspace-api</artifactId>
+         </dependency>
 
-      <dependency>
-         <groupId>org.dspace</groupId>
-         <artifactId>dspace-api</artifactId>
-      </dependency>
+         <dependency>
+             <groupId>org.dspace</groupId>
+             <artifactId>dspace-api-lang</artifactId>
+         </dependency>
 
-      <dependency>
-         <groupId>org.dspace</groupId>
-         <artifactId>dspace-api-lang</artifactId>
-      </dependency>
-      
-      <dependency>
-         <groupId>xom</groupId>
-         <artifactId>xom</artifactId>
-         <version>1.1</version>
-      </dependency>
-
-      <dependency>
-         <groupId>jaxen</groupId>
-         <artifactId>jaxen</artifactId>
-      </dependency>
-
-      <dependency>
-         <groupId>javax.servlet</groupId>
-         <artifactId>servlet-api</artifactId>
-      </dependency>
-
-       <!-- additional dependencies for the sword-common code -->
-                       <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.0.1</version>
-                </dependency>
-                <dependency>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>servlet-api</artifactId>
-                        <version>2.4</version>
-                </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>
-                                        <groupId>com.sun.jdmk</groupId>
-                                </exclusion>
-                                <exclusion>
-                                        <artifactId>jms</artifactId>
-                                        <groupId>javax.jms</groupId>
-                                </exclusion>
-                                <exclusion>
-                                        <artifactId>jmxri</artifactId>
-                                        <groupId>com.sun.jmx</groupId>
-                                </exclusion>
-                        </exclusions>
-                </dependency>
-       <!-- GUI client dependency
-                <dependency>
-                        <groupId>org.jdesktop</groupId>
-                        <artifactId>swing-worker</artifactId>
-                        <version>1.1</version>
-                </dependency>
-                -->
-                <dependency>
-                        <groupId>xom</groupId>
-                        <artifactId>xom</artifactId>
-                        <version>1.1</version>
-                </dependency>
-                <dependency>
-                        <groupId>commons-io</groupId>
-                        <artifactId>commons-io</artifactId>
-                        <version>1.3.1</version>
-                </dependency>
+         <dependency>
+             <groupId>jaxen</groupId>
+             <artifactId>jaxen</artifactId>
+         </dependency>
 
+        <!-- additional dependencies for the sword-common code -->
+        <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.0.1</version>
+         </dependency>
+         <dependency>
+             <groupId>javax.servlet</groupId>
+             <artifactId>servlet-api</artifactId>
+             <version>2.4</version>
+         </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>
+                         <groupId>com.sun.jdmk</groupId>
+                 </exclusion>
+                 <exclusion>
+                         <artifactId>jms</artifactId>
+                         <groupId>javax.jms</groupId>
+                 </exclusion>
+                 <exclusion>
+                         <artifactId>jmxri</artifactId>
+                         <groupId>com.sun.jmx</groupId>
+                 </exclusion>
+             </exclusions>
+         </dependency>
+         <dependency>
+                 <groupId>xom</groupId>
+                 <artifactId>xom</artifactId>
+                 <version>1.1</version>
+         </dependency>
+         <dependency>
+                 <groupId>commons-io</groupId>
+                 <artifactId>commons-io</artifactId>
+                 <version>1.3.1</version>
+         </dependency>
 
    </dependencies>
 
diff --git a/dspace/CHANGES b/dspace/CHANGES
index 48a39946c4..1a417009fd 100644
--- a/dspace/CHANGES
+++ b/dspace/CHANGES
@@ -1,6 +1,9 @@
 1.6.1
 =====
 
+(Caryn Neiswender)
+ - [DS-518] Duplicate listing of dependencies in dspace-sword/pom.xml
+
 (Keith Gilbertson)
  - [DS-508] Attachment spelled as attachement in DailyReportEmailer