diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..03b42152e9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,14 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Standard to msysgit
+*.doc  diff=astextplain
+*.DOC  diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF  diff=astextplain
+*.rtf  diff=astextplain
+*.RTF  diff=astextplain
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..34e4cb9cf1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,23 @@
+## Ignore the MVN compiled output directories from version tracking
+target/
+
+## Ignore project files created by Eclipse
+.settings/
+.project
+.classpath
+
+## Ignore project files created by IntelliJ IDEA
+*.iml
+*.ipr
+*.iws
+.idea/
+
+## Ignore project files created by NetBeans
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+nbactions.xml
+nb-configuration.xml
+META-INF/
\ No newline at end of file
diff --git a/dspace-discovery/dspace-discovery-provider/pom.xml b/dspace-discovery/dspace-discovery-provider/pom.xml
index 72fec25097..02763416ad 100644
--- a/dspace-discovery/dspace-discovery-provider/pom.xml
+++ b/dspace-discovery/dspace-discovery-provider/pom.xml
@@ -1,113 +1,113 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-	<packaging>jar</packaging>
-	<groupId>org.dspace</groupId>
-	<artifactId>dspace-discovery-provider</artifactId>
-	<version>1.8.3-SNAPSHOT</version>
-    <name>DSpace Discovery :: Discovery Provider Library</name>
-    <description>
-
-
-
-        Build Information
-        $Id: pom.xml 5367 2010-09-30 00:30:11Z mdiggory $
-        $URL: https://scm.dspace.org/svn/repo/modules/dspace-discovery/trunk/provider/pom.xml $
-    </description>
-    <parent>
-        <groupId>org.dspace</groupId>
-        <artifactId>dspace-discovery</artifactId>
-        <version>1.8.3-SNAPSHOT</version>
-      <relativePath>..</relativePath>
-   </parent>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-api</artifactId>
-        </dependency>
-    
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-    </dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.cocoon</groupId>
-				<artifactId>cocoon-maven-plugin</artifactId>
-				<version>1.0.0-M2</version>
-				<executions>
-					<execution>
-						<id>prepare</id>
-						<phase>compile</phase>
-						<goals>
-							<goal>prepare</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<version>6.1.7</version>
-				<configuration>
-					<connectors>
-						<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-							<port>8888</port>
-							<maxIdleTime>30000</maxIdleTime>
-						</connector>
-					</connectors>
-					<webAppSourceDirectory>${project.build.directory}/rcl/webapp</webAppSourceDirectory>
-					<contextPath>/</contextPath>
-					<systemProperties>
-						<systemProperty>
-							<name>org.apache.cocoon.mode</name>
-							<value>dev</value>
-						</systemProperty>
-					</systemProperties>
-				</configuration>
-			</plugin>
-			<!--
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.1</version>
-				<configuration>
-					<archive>
-						<manifestEntries>
-							<Cocoon-Block-Name>${pom.artifactId}</Cocoon-Block-Name>
-						</manifestEntries>
-					</archive>
-				</configuration>
-			</plugin>
-			-->
-			<plugin>
-				<artifactId>maven-eclipse-plugin</artifactId>
-				<version>2.5</version>
-			</plugin>
-		</plugins>
-	</build>
-
-    <!--
-       The Subversion repository location is used by Continuum to update
-       against when changes have occured, this spawns a new build cycle
-       and releases snapshots into the snapshot repository below.
-    -->
-    <scm>
-        <connection>scm:svn:http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-provider</connection>
-        <developerConnection>
-            scm:svn:https://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-provider
-        </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-provider</url>
-    </scm>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+	<packaging>jar</packaging>
+	<groupId>org.dspace</groupId>
+	<artifactId>dspace-discovery-provider</artifactId>
+	<version>1.8.3-SNAPSHOT</version>
+    <name>DSpace Discovery :: Discovery Provider Library</name>
+    <description>
+
+
+
+        Build Information
+        $Id: pom.xml 5367 2010-09-30 00:30:11Z mdiggory $
+        $URL: https://scm.dspace.org/svn/repo/modules/dspace-discovery/trunk/provider/pom.xml $
+    </description>
+    <parent>
+        <groupId>org.dspace</groupId>
+        <artifactId>dspace-discovery</artifactId>
+        <version>1.8.3-SNAPSHOT</version>
+      <relativePath>..</relativePath>
+   </parent>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.dspace</groupId>
+            <artifactId>dspace-api</artifactId>
+        </dependency>
+    
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.cocoon</groupId>
+				<artifactId>cocoon-maven-plugin</artifactId>
+				<version>1.0.0-M2</version>
+				<executions>
+					<execution>
+						<id>prepare</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>prepare</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.mortbay.jetty</groupId>
+				<artifactId>maven-jetty-plugin</artifactId>
+				<version>6.1.7</version>
+				<configuration>
+					<connectors>
+						<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+							<port>8888</port>
+							<maxIdleTime>30000</maxIdleTime>
+						</connector>
+					</connectors>
+					<webAppSourceDirectory>${project.build.directory}/rcl/webapp</webAppSourceDirectory>
+					<contextPath>/</contextPath>
+					<systemProperties>
+						<systemProperty>
+							<name>org.apache.cocoon.mode</name>
+							<value>dev</value>
+						</systemProperty>
+					</systemProperties>
+				</configuration>
+			</plugin>
+			<!--
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.1</version>
+				<configuration>
+					<archive>
+						<manifestEntries>
+							<Cocoon-Block-Name>${pom.artifactId}</Cocoon-Block-Name>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+			-->
+			<plugin>
+				<artifactId>maven-eclipse-plugin</artifactId>
+				<version>2.5</version>
+			</plugin>
+		</plugins>
+	</build>
+
+    <!--
+       The Subversion repository location is used by Continuum to update
+       against when changes have occured, this spawns a new build cycle
+       and releases snapshots into the snapshot repository below.
+    -->
+    <scm>
+        <connection>scm:svn:http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-provider</connection>
+        <developerConnection>
+            scm:svn:https://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-provider
+        </developerConnection>
+        <url>http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-provider</url>
+    </scm>
+</project>
diff --git a/dspace-discovery/dspace-discovery-solr/pom.xml b/dspace-discovery/dspace-discovery-solr/pom.xml
index 30ba9107fd..a533b5758a 100644
--- a/dspace-discovery/dspace-discovery-solr/pom.xml
+++ b/dspace-discovery/dspace-discovery-solr/pom.xml
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-	<packaging>jar</packaging>
-	<groupId>org.dspace</groupId>
-	<artifactId>dspace-discovery-solr</artifactId>
-	<version>1.8.3-SNAPSHOT</version>
-    <name>DSpace Discovery :: Discovery Solr Implementation</name>
-
-    <parent>
-        <groupId>org.dspace</groupId>
-        <artifactId>dspace-discovery</artifactId>
-        <version>1.8.3-SNAPSHOT</version>
-      <relativePath>..</relativePath>
-   </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-discovery-provider</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.solr</groupId>
-            <artifactId>solr-solrj</artifactId>
-            <version>3.3.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-    </dependencies>
-
-	<!--
-       The Subversion repository location is used by Continuum to update
-       against when changes have occured, this spawns a new build cycle
-       and releases snapshots into the snapshot repository below.
-    -->
-    <scm>
-        <connection>scm:svn:http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-solr</connection>
-        <developerConnection>
-            scm:svn:https://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-solr
-        </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-solr</url>
-    </scm>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+	<packaging>jar</packaging>
+	<groupId>org.dspace</groupId>
+	<artifactId>dspace-discovery-solr</artifactId>
+	<version>1.8.3-SNAPSHOT</version>
+    <name>DSpace Discovery :: Discovery Solr Implementation</name>
+
+    <parent>
+        <groupId>org.dspace</groupId>
+        <artifactId>dspace-discovery</artifactId>
+        <version>1.8.3-SNAPSHOT</version>
+      <relativePath>..</relativePath>
+   </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dspace</groupId>
+            <artifactId>dspace-discovery-provider</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-solrj</artifactId>
+            <version>3.3.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+	<!--
+       The Subversion repository location is used by Continuum to update
+       against when changes have occured, this spawns a new build cycle
+       and releases snapshots into the snapshot repository below.
+    -->
+    <scm>
+        <connection>scm:svn:http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-solr</connection>
+        <developerConnection>
+            scm:svn:https://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-solr
+        </developerConnection>
+        <url>http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-solr</url>
+    </scm>
+</project>
diff --git a/dspace-discovery/dspace-discovery-xmlui-api/pom.xml b/dspace-discovery/dspace-discovery-xmlui-api/pom.xml
index 4dc10b314f..ec7338b181 100644
--- a/dspace-discovery/dspace-discovery-xmlui-api/pom.xml
+++ b/dspace-discovery/dspace-discovery-xmlui-api/pom.xml
@@ -1,132 +1,132 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
-    <groupId>org.dspace</groupId>
-    <artifactId>dspace-discovery-xmlui-api</artifactId>
-    <version>1.8.3-SNAPSHOT</version>
-    <name>DSpace Discovery :: Discovery XMLUI API</name>
-
-    <parent>
-        <groupId>org.dspace</groupId>
-        <artifactId>dspace-discovery</artifactId>
-        <version>1.8.3-SNAPSHOT</version>
-      <relativePath>..</relativePath>
-   </parent>
-    
-    <dependencies>
-
-        <dependency>
-                <groupId>org.dspace</groupId>
-                <artifactId>dspace-xmlui-api</artifactId>
-                <exclusions>
-                	<exclusion>
-                		<artifactId>solr-solrj</artifactId>
-                		<groupId>org.apache.solr</groupId>
-                	</exclusion>
-                </exclusions>
-            </dependency>
-
-            <!-- external -->
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <scope>provided</scope>
-            </dependency>
-
-
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-discovery-provider</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.cocoon</groupId>
-                <artifactId>cocoon-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <executions>
-                    <execution>
-                        <id>prepare</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>prepare</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <!--
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-war-plugin</artifactId>
-               <configuration>
-                  <archiveClasses>false</archiveClasses>
-                  <attachClasses>true</attachClasses>
-                  <classesClassifier>classes</classesClassifier>
-                   <failOnMissingWebXml>false</failOnMissingWebXml>
-                   <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
-                   <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
-               </configuration>
-               <executions>
-                  <execution>
-                     <phase>prepare-package</phase>
-                  </execution>
-               </executions>
-            </plugin>
-            -->
-            <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.7</version>
-                <configuration>
-                    <connectors>
-                        <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                            <port>8888</port>
-                            <maxIdleTime>30000</maxIdleTime>
-                        </connector>
-                    </connectors>
-                    <webAppSourceDirectory>${project.build.directory}/rcl/webapp</webAppSourceDirectory>
-                    <contextPath>/</contextPath>
-                    <systemProperties>
-                        <systemProperty>
-                            <name>org.apache.cocoon.mode</name>
-                            <value>dev</value>
-                        </systemProperty>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-            <!--
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <index>true</index>
-                        <manifestEntries>
-                            <Cocoon-Block-Name>discovery-xmlui-block</Cocoon-Block-Name>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-            -->
-        </plugins>
-    </build>
-
-    <!--
-       The Subversion repository location is used by Continuum to update
-       against when changes have occured, this spawns a new build cycle
-       and releases snapshots into the snapshot repository below.
-    -->
-    <scm>
-        <connection>scm:svn:http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-xmlui-api</connection>
-        <developerConnection>
-            scm:svn:https://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-xmlui-api
-        </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-xmlui-api</url>
-    </scm>
-    
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <groupId>org.dspace</groupId>
+    <artifactId>dspace-discovery-xmlui-api</artifactId>
+    <version>1.8.3-SNAPSHOT</version>
+    <name>DSpace Discovery :: Discovery XMLUI API</name>
+
+    <parent>
+        <groupId>org.dspace</groupId>
+        <artifactId>dspace-discovery</artifactId>
+        <version>1.8.3-SNAPSHOT</version>
+      <relativePath>..</relativePath>
+   </parent>
+    
+    <dependencies>
+
+        <dependency>
+                <groupId>org.dspace</groupId>
+                <artifactId>dspace-xmlui-api</artifactId>
+                <exclusions>
+                	<exclusion>
+                		<artifactId>solr-solrj</artifactId>
+                		<groupId>org.apache.solr</groupId>
+                	</exclusion>
+                </exclusions>
+            </dependency>
+
+            <!-- external -->
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                <scope>provided</scope>
+            </dependency>
+
+
+        <dependency>
+            <groupId>org.dspace</groupId>
+            <artifactId>dspace-discovery-provider</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.cocoon</groupId>
+                <artifactId>cocoon-maven-plugin</artifactId>
+                <version>1.0.0</version>
+                <executions>
+                    <execution>
+                        <id>prepare</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>prepare</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!--
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-war-plugin</artifactId>
+               <configuration>
+                  <archiveClasses>false</archiveClasses>
+                  <attachClasses>true</attachClasses>
+                  <classesClassifier>classes</classesClassifier>
+                   <failOnMissingWebXml>false</failOnMissingWebXml>
+                   <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
+                   <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+               </configuration>
+               <executions>
+                  <execution>
+                     <phase>prepare-package</phase>
+                  </execution>
+               </executions>
+            </plugin>
+            -->
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.1.7</version>
+                <configuration>
+                    <connectors>
+                        <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                            <port>8888</port>
+                            <maxIdleTime>30000</maxIdleTime>
+                        </connector>
+                    </connectors>
+                    <webAppSourceDirectory>${project.build.directory}/rcl/webapp</webAppSourceDirectory>
+                    <contextPath>/</contextPath>
+                    <systemProperties>
+                        <systemProperty>
+                            <name>org.apache.cocoon.mode</name>
+                            <value>dev</value>
+                        </systemProperty>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+            <!--
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <index>true</index>
+                        <manifestEntries>
+                            <Cocoon-Block-Name>discovery-xmlui-block</Cocoon-Block-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            -->
+        </plugins>
+    </build>
+
+    <!--
+       The Subversion repository location is used by Continuum to update
+       against when changes have occured, this spawns a new build cycle
+       and releases snapshots into the snapshot repository below.
+    -->
+    <scm>
+        <connection>scm:svn:http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-xmlui-api</connection>
+        <developerConnection>
+            scm:svn:https://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-xmlui-api
+        </developerConnection>
+        <url>http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-xmlui-api</url>
+    </scm>
+    
+</project>
diff --git a/dspace-discovery/dspace-discovery-xmlui-webapp/pom.xml b/dspace-discovery/dspace-discovery-xmlui-webapp/pom.xml
index 8761228cdc..72d8e3c17c 100644
--- a/dspace-discovery/dspace-discovery-xmlui-webapp/pom.xml
+++ b/dspace-discovery/dspace-discovery-xmlui-webapp/pom.xml
@@ -1,152 +1,152 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>war</packaging>
-    <groupId>org.dspace</groupId>
-    <artifactId>dspace-discovery-xmlui-webapp</artifactId>
-    <version>1.8.3-SNAPSHOT</version>
-    <name>DSpace Discovery :: Discovery XMLUI Webapp</name>
-
-    <parent>
-        <groupId>org.dspace</groupId>
-        <artifactId>dspace-discovery</artifactId>
-        <version>1.8.3-SNAPSHOT</version>
-      <relativePath>..</relativePath>
-   </parent>
-
-    <dependencies>
-
-        <dependency>
-                <groupId>org.dspace</groupId>
-                <artifactId>dspace-xmlui-api</artifactId>
-                <exclusions>
-                	<exclusion>
-                		<artifactId>solr-solrj</artifactId>
-                		<groupId>org.apache.solr</groupId>
-                	</exclusion>
-                </exclusions>
-            </dependency>
-
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-discovery-xmlui-api</artifactId>
-            <version>1.8.3-SNAPSHOT</version>
-        </dependency>
-
-            <!-- external -->
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <scope>provided</scope>
-            </dependency>
-
-
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.cocoon</groupId>
-                <artifactId>cocoon-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <executions>
-                    <execution>
-                        <id>prepare</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>prepare</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-war-plugin</artifactId>
-               <configuration>
-                  <archiveClasses>false</archiveClasses>
-                  <attachClasses>true</attachClasses>
-                  <classesClassifier>classes</classesClassifier>
-                   <failOnMissingWebXml>false</failOnMissingWebXml>
-                   <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
-                   <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
-                   <webResources>
-                      <resource>
-                         <filtering>true</filtering>
-                         <directory>${basedir}/src/main/webapp</directory>
-                         <includes>
-                            <include>WEB-INF/web.xml</include>
-                         </includes>
-                      </resource>
-                   </webResources>
-               </configuration>
-               <executions>
-                  <execution>
-                     <phase>prepare-package</phase>
-                  </execution>
-               </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.7</version>
-                <configuration>
-                    <connectors>
-                        <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                            <port>8888</port>
-                            <maxIdleTime>30000</maxIdleTime>
-                        </connector>
-                    </connectors>
-                    <webAppSourceDirectory>${project.build.directory}/rcl/webapp</webAppSourceDirectory>
-                    <contextPath>/</contextPath>
-                    <systemProperties>
-                        <systemProperty>
-                            <name>org.apache.cocoon.mode</name>
-                            <value>dev</value>
-                        </systemProperty>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.mycila.maven-license-plugin</groupId>
-                <artifactId>maven-license-plugin</artifactId>
-                <configuration>
-                    <!--Exclude license check for Discovery files which don't need it-->
-                    <excludes>
-                        <exclude>**/*.LICENSE</exclude>
-                        <exclude>**/jquery*</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-            <!--
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <index>true</index>
-                        <manifestEntries>
-                            <Cocoon-Block-Name>discovery-xmlui-block</Cocoon-Block-Name>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-            -->
-        </plugins>
-    </build>
-
-    <!--
-       The Subversion repository location is used by Continuum to update
-       against when changes have occured, this spawns a new build cycle
-       and releases snapshots into the snapshot repository below.
-    -->
-    <scm>
-        <connection>scm:svn:http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-xmlui-webapp</connection>
-        <developerConnection>
-            scm:svn:https://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-xmlui-webapp
-        </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-xmlui-webapp</url>
-    </scm>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>war</packaging>
+    <groupId>org.dspace</groupId>
+    <artifactId>dspace-discovery-xmlui-webapp</artifactId>
+    <version>1.8.3-SNAPSHOT</version>
+    <name>DSpace Discovery :: Discovery XMLUI Webapp</name>
+
+    <parent>
+        <groupId>org.dspace</groupId>
+        <artifactId>dspace-discovery</artifactId>
+        <version>1.8.3-SNAPSHOT</version>
+      <relativePath>..</relativePath>
+   </parent>
+
+    <dependencies>
+
+        <dependency>
+                <groupId>org.dspace</groupId>
+                <artifactId>dspace-xmlui-api</artifactId>
+                <exclusions>
+                	<exclusion>
+                		<artifactId>solr-solrj</artifactId>
+                		<groupId>org.apache.solr</groupId>
+                	</exclusion>
+                </exclusions>
+            </dependency>
+
+        <dependency>
+            <groupId>org.dspace</groupId>
+            <artifactId>dspace-discovery-xmlui-api</artifactId>
+            <version>1.8.3-SNAPSHOT</version>
+        </dependency>
+
+            <!-- external -->
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                <scope>provided</scope>
+            </dependency>
+
+
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.cocoon</groupId>
+                <artifactId>cocoon-maven-plugin</artifactId>
+                <version>1.0.0</version>
+                <executions>
+                    <execution>
+                        <id>prepare</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>prepare</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-war-plugin</artifactId>
+               <configuration>
+                  <archiveClasses>false</archiveClasses>
+                  <attachClasses>true</attachClasses>
+                  <classesClassifier>classes</classesClassifier>
+                   <failOnMissingWebXml>false</failOnMissingWebXml>
+                   <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
+                   <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+                   <webResources>
+                      <resource>
+                         <filtering>true</filtering>
+                         <directory>${basedir}/src/main/webapp</directory>
+                         <includes>
+                            <include>WEB-INF/web.xml</include>
+                         </includes>
+                      </resource>
+                   </webResources>
+               </configuration>
+               <executions>
+                  <execution>
+                     <phase>prepare-package</phase>
+                  </execution>
+               </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.1.7</version>
+                <configuration>
+                    <connectors>
+                        <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                            <port>8888</port>
+                            <maxIdleTime>30000</maxIdleTime>
+                        </connector>
+                    </connectors>
+                    <webAppSourceDirectory>${project.build.directory}/rcl/webapp</webAppSourceDirectory>
+                    <contextPath>/</contextPath>
+                    <systemProperties>
+                        <systemProperty>
+                            <name>org.apache.cocoon.mode</name>
+                            <value>dev</value>
+                        </systemProperty>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.mycila.maven-license-plugin</groupId>
+                <artifactId>maven-license-plugin</artifactId>
+                <configuration>
+                    <!--Exclude license check for Discovery files which don't need it-->
+                    <excludes>
+                        <exclude>**/*.LICENSE</exclude>
+                        <exclude>**/jquery*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <!--
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <index>true</index>
+                        <manifestEntries>
+                            <Cocoon-Block-Name>discovery-xmlui-block</Cocoon-Block-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            -->
+        </plugins>
+    </build>
+
+    <!--
+       The Subversion repository location is used by Continuum to update
+       against when changes have occured, this spawns a new build cycle
+       and releases snapshots into the snapshot repository below.
+    -->
+    <scm>
+        <connection>scm:svn:http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-xmlui-webapp</connection>
+        <developerConnection>
+            scm:svn:https://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-xmlui-webapp
+        </developerConnection>
+        <url>http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery/dspace-discovery-xmlui-webapp</url>
+    </scm>
+
+</project>
diff --git a/dspace-discovery/pom.xml b/dspace-discovery/pom.xml
index bc9c0ae4b5..f2f34c3054 100644
--- a/dspace-discovery/pom.xml
+++ b/dspace-discovery/pom.xml
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
-    <groupId>org.dspace</groupId>
-    <artifactId>dspace-discovery</artifactId>
-    <version>1.8.3-SNAPSHOT</version>
-    <name>DSpace Discovery :: Modules</name>
-
-    <parent>
-        <artifactId>dspace-parent</artifactId>
-        <groupId>org.dspace</groupId>
-        <version>1.8.3-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-    
-    <modules>
-        <module>dspace-discovery-provider</module>
-        <module>dspace-discovery-solr</module>
-        <module>dspace-discovery-xmlui-api</module>
-        <module>dspace-discovery-xmlui-webapp</module>
-    </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.7</version>
-                <configuration>
-                    <connectors>
-                        <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                            <port>8888</port>
-                            <maxIdleTime>30000</maxIdleTime>
-                        </connector>
-                    </connectors>
-                    <webAppSourceDirectory>${project.build.directory}/rcl/webapp</webAppSourceDirectory>
-                    <contextPath>/</contextPath>
-                    <systemProperties>
-                        <systemProperty>
-                            <name>org.apache.cocoon.mode</name>
-                            <value>dev</value>
-                        </systemProperty>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <!--
-       The Subversion repository location is used by Continuum to update
-       against when changes have occured, this spawns a new build cycle
-       and releases snapshots into the snapshot repository below.
-    -->
-    <scm>
-        <connection>scm:svn:http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery</connection>
-        <developerConnection>
-            scm:svn:https://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery
-        </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery</url>
-    </scm>
-
-    <issueManagement>
-      <system>JIRA</system>
-      <url>http://jira.dspace.org/jira/browse/DISCOVERY</url>
-    </issueManagement>
-    
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>pom</packaging>
+    <groupId>org.dspace</groupId>
+    <artifactId>dspace-discovery</artifactId>
+    <version>1.8.3-SNAPSHOT</version>
+    <name>DSpace Discovery :: Modules</name>
+
+    <parent>
+        <artifactId>dspace-parent</artifactId>
+        <groupId>org.dspace</groupId>
+        <version>1.8.3-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+    
+    <modules>
+        <module>dspace-discovery-provider</module>
+        <module>dspace-discovery-solr</module>
+        <module>dspace-discovery-xmlui-api</module>
+        <module>dspace-discovery-xmlui-webapp</module>
+    </modules>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.1.7</version>
+                <configuration>
+                    <connectors>
+                        <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                            <port>8888</port>
+                            <maxIdleTime>30000</maxIdleTime>
+                        </connector>
+                    </connectors>
+                    <webAppSourceDirectory>${project.build.directory}/rcl/webapp</webAppSourceDirectory>
+                    <contextPath>/</contextPath>
+                    <systemProperties>
+                        <systemProperty>
+                            <name>org.apache.cocoon.mode</name>
+                            <value>dev</value>
+                        </systemProperty>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!--
+       The Subversion repository location is used by Continuum to update
+       against when changes have occured, this spawns a new build cycle
+       and releases snapshots into the snapshot repository below.
+    -->
+    <scm>
+        <connection>scm:svn:http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery</connection>
+        <developerConnection>
+            scm:svn:https://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery
+        </developerConnection>
+        <url>http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-discovery</url>
+    </scm>
+
+    <issueManagement>
+      <system>JIRA</system>
+      <url>http://jira.dspace.org/jira/browse/DISCOVERY</url>
+    </issueManagement>
+    
+</project>
diff --git a/dspace-sword-client/dspace-sword-client-api/pom.xml b/dspace-sword-client/dspace-sword-client-api/pom.xml
index 051b7d99d8..2de19e1401 100644
--- a/dspace-sword-client/dspace-sword-client-api/pom.xml
+++ b/dspace-sword-client/dspace-sword-client-api/pom.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
-    <groupId>org.dspace</groupId>
-    <artifactId>dspace-sword-client-api</artifactId>
-    <version>1.8.3-SNAPSHOT</version>
-    <name>DSpace Sword Client :: Sword Client API</name>
-
-    <parent>
-        <groupId>org.dspace</groupId>
-        <artifactId>dspace-sword-client</artifactId>
-        <version>1.8.3-SNAPSHOT</version>
-      <relativePath>..</relativePath>
-   </parent>
-    
-    <dependencies>
-         <dependency>
-                <groupId>org.dspace</groupId>
-                <artifactId>dspace-api</artifactId>
-        </dependency>
-        <dependency>
-                <groupId>org.dspace</groupId>
-                <artifactId>dspace-sword-api</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <!--
-       The Subversion repository location is used by Continuum to update
-       against when changes have occured, this spawns a new build cycle
-       and releases snapshots into the snapshot repository below.
-    -->
-    <scm>
-        <connection>scm:svn:http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client/dspace-sword-client-api</connection>
-        <developerConnection>
-            scm:svn:https://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client/dspace-sword-client-api
-        </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client/dspace-sword-client-api</url>
-    </scm>
-    
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <groupId>org.dspace</groupId>
+    <artifactId>dspace-sword-client-api</artifactId>
+    <version>1.8.3-SNAPSHOT</version>
+    <name>DSpace Sword Client :: Sword Client API</name>
+
+    <parent>
+        <groupId>org.dspace</groupId>
+        <artifactId>dspace-sword-client</artifactId>
+        <version>1.8.3-SNAPSHOT</version>
+      <relativePath>..</relativePath>
+   </parent>
+    
+    <dependencies>
+         <dependency>
+                <groupId>org.dspace</groupId>
+                <artifactId>dspace-api</artifactId>
+        </dependency>
+        <dependency>
+                <groupId>org.dspace</groupId>
+                <artifactId>dspace-sword-api</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <!--
+       The Subversion repository location is used by Continuum to update
+       against when changes have occured, this spawns a new build cycle
+       and releases snapshots into the snapshot repository below.
+    -->
+    <scm>
+        <connection>scm:svn:http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client/dspace-sword-client-api</connection>
+        <developerConnection>
+            scm:svn:https://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client/dspace-sword-client-api
+        </developerConnection>
+        <url>http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client/dspace-sword-client-api</url>
+    </scm>
+    
+</project>
diff --git a/dspace-sword-client/dspace-sword-client-xmlui-api/pom.xml b/dspace-sword-client/dspace-sword-client-xmlui-api/pom.xml
index b73b5ae8fd..251efae308 100644
--- a/dspace-sword-client/dspace-sword-client-xmlui-api/pom.xml
+++ b/dspace-sword-client/dspace-sword-client-xmlui-api/pom.xml
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
-    <groupId>org.dspace</groupId>
-    <artifactId>dspace-sword-client-xmlui-api</artifactId>
-    <version>1.8.3-SNAPSHOT</version>
-    <name>DSpace Sword Client :: Sword Client XMLUI API</name>
-
-    <parent>
-        <groupId>org.dspace</groupId>
-        <artifactId>dspace-sword-client</artifactId>
-        <version>1.8.3-SNAPSHOT</version>
-      <relativePath>..</relativePath>
-    </parent>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-xmlui-api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>solr-solrj</artifactId>
-                    <groupId>org.apache.solr</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- external -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-sword-client-api</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <!--
-       The Subversion repository location is used by Continuum to update
-       against when changes have occured, this spawns a new build cycle
-       and releases snapshots into the snapshot repository below.
-    -->
-    <scm>
-        <connection>scm:svn:http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client/dspace-sword-client-xmlui-api
-        </connection>
-        <developerConnection>
-            scm:svn:https://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client/dspace-sword-client-xmlui-api
-        </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client/dspace-sword-client-xmlui-api</url>
-    </scm>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <groupId>org.dspace</groupId>
+    <artifactId>dspace-sword-client-xmlui-api</artifactId>
+    <version>1.8.3-SNAPSHOT</version>
+    <name>DSpace Sword Client :: Sword Client XMLUI API</name>
+
+    <parent>
+        <groupId>org.dspace</groupId>
+        <artifactId>dspace-sword-client</artifactId>
+        <version>1.8.3-SNAPSHOT</version>
+      <relativePath>..</relativePath>
+    </parent>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.dspace</groupId>
+            <artifactId>dspace-xmlui-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>solr-solrj</artifactId>
+                    <groupId>org.apache.solr</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- external -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dspace</groupId>
+            <artifactId>dspace-sword-client-api</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <!--
+       The Subversion repository location is used by Continuum to update
+       against when changes have occured, this spawns a new build cycle
+       and releases snapshots into the snapshot repository below.
+    -->
+    <scm>
+        <connection>scm:svn:http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client/dspace-sword-client-xmlui-api
+        </connection>
+        <developerConnection>
+            scm:svn:https://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client/dspace-sword-client-xmlui-api
+        </developerConnection>
+        <url>http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client/dspace-sword-client-xmlui-api</url>
+    </scm>
+
+</project>
diff --git a/dspace-sword-client/dspace-sword-client-xmlui-webapp/pom.xml b/dspace-sword-client/dspace-sword-client-xmlui-webapp/pom.xml
index 8340521335..ecc93d2e53 100644
--- a/dspace-sword-client/dspace-sword-client-xmlui-webapp/pom.xml
+++ b/dspace-sword-client/dspace-sword-client-xmlui-webapp/pom.xml
@@ -1,93 +1,93 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>war</packaging>
-    <groupId>org.dspace</groupId>
-    <artifactId>dspace-sword-client-xmlui-webapp</artifactId>
-    <version>1.8.3-SNAPSHOT</version>
-    <name>DSpace Sword Client :: Sword Client XMLUI Webapp</name>
-
-    <parent>
-        <groupId>org.dspace</groupId>
-        <artifactId>dspace-sword-client</artifactId>
-        <version>1.8.3-SNAPSHOT</version>
-      <relativePath>..</relativePath>
-    </parent>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-xmlui-api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>solr-solrj</artifactId>
-                    <groupId>org.apache.solr</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-sword-client-xmlui-api</artifactId>
-        </dependency>
-
-        <!-- external -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-
-    </dependencies>
-
-    <build>
-        <plugins>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <archiveClasses>false</archiveClasses>
-                    <attachClasses>true</attachClasses>
-                    <classesClassifier>classes</classesClassifier>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
-                    <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
-                    <webResources>
-                        <resource>
-                            <filtering>true</filtering>
-                            <directory>${basedir}/src/main/webapp</directory>
-                            <includes>
-                                <include>WEB-INF/web.xml</include>
-                            </includes>
-                        </resource>
-                    </webResources>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-
-    <!--
-       The Subversion repository location is used by Continuum to update
-       against when changes have occured, this spawns a new build cycle
-       and releases snapshots into the snapshot repository below.
-    -->
-    <scm>
-        <connection>
-            scm:svn:http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client/dspace-sword-client-xmlui-webapp
-        </connection>
-        <developerConnection>
-            scm:svn:https://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client/dspace-sword-client-xmlui-webapp
-        </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client/dspace-sword-client-xmlui-webapp</url>
-    </scm>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>war</packaging>
+    <groupId>org.dspace</groupId>
+    <artifactId>dspace-sword-client-xmlui-webapp</artifactId>
+    <version>1.8.3-SNAPSHOT</version>
+    <name>DSpace Sword Client :: Sword Client XMLUI Webapp</name>
+
+    <parent>
+        <groupId>org.dspace</groupId>
+        <artifactId>dspace-sword-client</artifactId>
+        <version>1.8.3-SNAPSHOT</version>
+      <relativePath>..</relativePath>
+    </parent>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.dspace</groupId>
+            <artifactId>dspace-xmlui-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>solr-solrj</artifactId>
+                    <groupId>org.apache.solr</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dspace</groupId>
+            <artifactId>dspace-sword-client-xmlui-api</artifactId>
+        </dependency>
+
+        <!-- external -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+
+    </dependencies>
+
+    <build>
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <archiveClasses>false</archiveClasses>
+                    <attachClasses>true</attachClasses>
+                    <classesClassifier>classes</classesClassifier>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
+                    <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+                    <webResources>
+                        <resource>
+                            <filtering>true</filtering>
+                            <directory>${basedir}/src/main/webapp</directory>
+                            <includes>
+                                <include>WEB-INF/web.xml</include>
+                            </includes>
+                        </resource>
+                    </webResources>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
+    <!--
+       The Subversion repository location is used by Continuum to update
+       against when changes have occured, this spawns a new build cycle
+       and releases snapshots into the snapshot repository below.
+    -->
+    <scm>
+        <connection>
+            scm:svn:http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client/dspace-sword-client-xmlui-webapp
+        </connection>
+        <developerConnection>
+            scm:svn:https://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client/dspace-sword-client-xmlui-webapp
+        </developerConnection>
+        <url>http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client/dspace-sword-client-xmlui-webapp</url>
+    </scm>
+
+</project>
diff --git a/dspace-sword-client/pom.xml b/dspace-sword-client/pom.xml
index e72508dd1c..6ddf955a47 100644
--- a/dspace-sword-client/pom.xml
+++ b/dspace-sword-client/pom.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
-    <groupId>org.dspace</groupId>
-    <artifactId>dspace-sword-client</artifactId>
-    <version>1.8.3-SNAPSHOT</version>
-    <name>DSpace Sword Client</name>
-
-    <parent>
-        <artifactId>dspace-parent</artifactId>
-        <groupId>org.dspace</groupId>
-        <version>1.8.3-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-    
-    <modules>
-        <module>dspace-sword-client-api</module>
-        <module>dspace-sword-client-xmlui-api</module>
-        <module>dspace-sword-client-xmlui-webapp</module>
-    </modules>
-
-    <!--
-       The Subversion repository location is used by Continuum to update
-       against when changes have occurred, this spawns a new build cycle
-       and releases snapshots into the snapshot repository below.
-    -->
-    <scm>
-        <connection>scm:svn:http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client</connection>
-        <developerConnection>
-            scm:svn:https://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client
-        </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client</url>
-    </scm>
-
-    <issueManagement>
-      <system>JIRA</system>
-      <url>http://jira.dspace.org/jira/browse/SWORD</url>
-    </issueManagement>
-    
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>pom</packaging>
+    <groupId>org.dspace</groupId>
+    <artifactId>dspace-sword-client</artifactId>
+    <version>1.8.3-SNAPSHOT</version>
+    <name>DSpace Sword Client</name>
+
+    <parent>
+        <artifactId>dspace-parent</artifactId>
+        <groupId>org.dspace</groupId>
+        <version>1.8.3-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+    
+    <modules>
+        <module>dspace-sword-client-api</module>
+        <module>dspace-sword-client-xmlui-api</module>
+        <module>dspace-sword-client-xmlui-webapp</module>
+    </modules>
+
+    <!--
+       The Subversion repository location is used by Continuum to update
+       against when changes have occurred, this spawns a new build cycle
+       and releases snapshots into the snapshot repository below.
+    -->
+    <scm>
+        <connection>scm:svn:http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client</connection>
+        <developerConnection>
+            scm:svn:https://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client
+        </developerConnection>
+        <url>http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-sword-client</url>
+    </scm>
+
+    <issueManagement>
+      <system>JIRA</system>
+      <url>http://jira.dspace.org/jira/browse/SWORD</url>
+    </issueManagement>
+    
+</project>
diff --git a/dspace-swordv2/pom.xml b/dspace-swordv2/pom.xml
index 9d2d010e21..4a00d55bd3 100644
--- a/dspace-swordv2/pom.xml
+++ b/dspace-swordv2/pom.xml
@@ -1,168 +1,168 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.dspace</groupId>
-    <artifactId>dspace-swordv2</artifactId>
-    <packaging>war</packaging>
-    <name>DSpace SWORD v2 :: Web Application Resources</name>
-    <description>DSpace SWORD v2 Deposit Service Provider Web Application</description>
-    <url>http://projects.dspace.org/dspace-sword-webapp</url>
-
-    <!--
-       A Parent POM that Maven inherits DSpace Default
-       POM atrributes from.
-    -->
-    <parent>
-        <groupId>org.dspace</groupId>
-        <artifactId>dspace-parent</artifactId>
-        <version>1.8.3-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-
-    <!--
-       The Subversion repository location is used by Continuum to update against
-       when changes have occurred, this spawns a new build cycle and releases snapshots
-       into the snapshot repository below.
-    -->
-    <scm>
-        <connection>scm:svn:http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-swordv2</connection>
-        <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-swordv2</developerConnection>
-        <url>http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-swordv2</url>
-    </scm>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <attachClasses>true</attachClasses>
-                    <!-- In version 2.1-alpha-1, this was incorrectly named warSourceExcludes -->
-                    <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
-                    <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
-                    <webResources>
-                        <resource>
-                            <filtering>true</filtering>
-                            <directory>${basedir}/src/main/webapp</directory>
-                            <includes>
-                                <include>WEB-INF/web.xml</include>
-                            </includes>
-                        </resource>
-                    </webResources>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-
-    <profiles>
-        <!--
-           when activated a dspace.config configuration
-           file location passed on the commandline
-           (-Ddspace.config=...) can be passed through
-           to be used as a filter source by projects for
-           tasks such as updating the ${dspace.dir} in
-           web.xml etc.
-        -->
-        <profile>
-            <activation>
-                <property>
-                    <name>dspace.config</name>
-                </property>
-            </activation>
-            <build>
-                <filters>
-                    <filter>${dspace.config}</filter>
-                </filters>
-            </build>
-        </profile>
-        <profile>
-            <id>oracle-support</id>
-            <activation>
-                <property>
-                    <name>db.name</name>
-                    <value>oracle</value>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>com.oracle</groupId>
-                    <artifactId>ojdbc6</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>postgres-support</id>
-            <activation>
-                <property>
-                    <name>!db.name</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>postgresql</groupId>
-                    <artifactId>postgresql</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
-    <dependencies>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.swordapp</groupId>
-            <artifactId>server</artifactId>
-            <version>2.0</version>
-            <type>jar</type>
-            <classifier>classes</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.swordapp</groupId>
-            <artifactId>server</artifactId>
-            <version>2.0</version>
-            <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.googlecode.foresite-toolkit</groupId>
-            <artifactId>foresite</artifactId>
-            <version>0.9</version>
-        </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>org.apache.abdera</groupId>
-            <artifactId>abdera-client</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-    </dependencies>
-
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.dspace</groupId>
+    <artifactId>dspace-swordv2</artifactId>
+    <packaging>war</packaging>
+    <name>DSpace SWORD v2 :: Web Application Resources</name>
+    <description>DSpace SWORD v2 Deposit Service Provider Web Application</description>
+    <url>http://projects.dspace.org/dspace-sword-webapp</url>
+
+    <!--
+       A Parent POM that Maven inherits DSpace Default
+       POM atrributes from.
+    -->
+    <parent>
+        <groupId>org.dspace</groupId>
+        <artifactId>dspace-parent</artifactId>
+        <version>1.8.3-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <!--
+       The Subversion repository location is used by Continuum to update against
+       when changes have occurred, this spawns a new build cycle and releases snapshots
+       into the snapshot repository below.
+    -->
+    <scm>
+        <connection>scm:svn:http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-swordv2</connection>
+        <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-swordv2</developerConnection>
+        <url>http://scm.dspace.org/svn/repo/branches/dspace-1_8_x/dspace-swordv2</url>
+    </scm>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <attachClasses>true</attachClasses>
+                    <!-- In version 2.1-alpha-1, this was incorrectly named warSourceExcludes -->
+                    <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
+                    <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+                    <webResources>
+                        <resource>
+                            <filtering>true</filtering>
+                            <directory>${basedir}/src/main/webapp</directory>
+                            <includes>
+                                <include>WEB-INF/web.xml</include>
+                            </includes>
+                        </resource>
+                    </webResources>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+    <profiles>
+        <!--
+           when activated a dspace.config configuration
+           file location passed on the commandline
+           (-Ddspace.config=...) can be passed through
+           to be used as a filter source by projects for
+           tasks such as updating the ${dspace.dir} in
+           web.xml etc.
+        -->
+        <profile>
+            <activation>
+                <property>
+                    <name>dspace.config</name>
+                </property>
+            </activation>
+            <build>
+                <filters>
+                    <filter>${dspace.config}</filter>
+                </filters>
+            </build>
+        </profile>
+        <profile>
+            <id>oracle-support</id>
+            <activation>
+                <property>
+                    <name>db.name</name>
+                    <value>oracle</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>com.oracle</groupId>
+                    <artifactId>ojdbc6</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>postgres-support</id>
+            <activation>
+                <property>
+                    <name>!db.name</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>postgresql</groupId>
+                    <artifactId>postgresql</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.swordapp</groupId>
+            <artifactId>server</artifactId>
+            <version>2.0</version>
+            <type>jar</type>
+            <classifier>classes</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.swordapp</groupId>
+            <artifactId>server</artifactId>
+            <version>2.0</version>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>org.dspace</groupId>
+            <artifactId>dspace-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.foresite-toolkit</groupId>
+            <artifactId>foresite</artifactId>
+            <version>0.9</version>
+        </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>org.apache.abdera</groupId>
+            <artifactId>abdera-client</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+    </dependencies>
+
+</project>