From 9590a1571cdc38e312a43a9c3274afcfb0a49323 Mon Sep 17 00:00:00 2001
From: Robin Taylor <robin.taylor@ed.ac.uk>
Date: Thu, 7 Aug 2014 09:09:37 +0100
Subject: [PATCH 1/2] DS-2091 Upgrade HttpComponents to 4.3.5

---
 dspace-api/pom.xml | 1 -
 pom.xml            | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml
index 593723e761..08f5f2191f 100644
--- a/dspace-api/pom.xml
+++ b/dspace-api/pom.xml
@@ -446,7 +446,6 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.2.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.solr</groupId>
diff --git a/pom.xml b/pom.xml
index 431659edab..9d8b527443 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1000,6 +1000,11 @@
             <artifactId>commons-httpclient</artifactId>
             <version>3.1</version>
          </dependency>
+	 <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.3.5</version>
+         </dependency>
          <dependency>
              <groupId>org.slf4j</groupId>
              <artifactId>jcl-over-slf4j</artifactId>

From 26f853123289f674f6a8355e9e096a9f6748e8ae Mon Sep 17 00:00:00 2001
From: Robin Taylor <robin.taylor@ed.ac.uk>
Date: Thu, 7 Aug 2014 09:11:41 +0100
Subject: [PATCH 2/2] DS-2091 Wee code change resulting from HttpComponents
 upgrade

---
 .../src/main/java/org/dspace/identifier/ezid/EZIDRequest.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dspace-api/src/main/java/org/dspace/identifier/ezid/EZIDRequest.java b/dspace-api/src/main/java/org/dspace/identifier/ezid/EZIDRequest.java
index c3fc10bc07..e2d4d331ae 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/ezid/EZIDRequest.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/ezid/EZIDRequest.java
@@ -175,9 +175,7 @@ public class EZIDRequest
         request = new HttpPut(uri);
         if (null != metadata)
         {
-            try {
-                request.setEntity(new StringEntity(formatMetadata(metadata), UTF_8));
-            } catch (UnsupportedEncodingException ex) { /* SNH */ }
+            request.setEntity(new StringEntity(formatMetadata(metadata), UTF_8));
         }
         HttpResponse response = client.execute(request);
         return new EZIDResponse(response);