From 7257d2a057de284cdcc2c3fc3f626601a36c81f1 Mon Sep 17 00:00:00 2001
From: "Code Hugger (Matthew Jones)" <matthew@longsight.com>
Date: Thu, 21 Sep 2017 10:09:43 -0400
Subject: [PATCH] SAK-33388 - Update httpclient/httpcore to newest, have all
 tools use shared version (#4813)

---
 content-review/impl/pom.xml | 10 ----------
 deploy/pom.xml              | 15 +++++++++++++++
 master/pom.xml              | 21 +++++++++++++++++++++
 shortenedurl/pom.xml        |  8 --------
 4 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/content-review/impl/pom.xml b/content-review/impl/pom.xml
index fdf139ecb6cc..342e71a782fb 100644
--- a/content-review/impl/pom.xml
+++ b/content-review/impl/pom.xml
@@ -29,16 +29,6 @@
 			  <classifier>jdk15</classifier>
 			  <version>2.4</version>
 		  </dependency>
-		  <dependency>
-			  <groupId>org.apache.httpcomponents</groupId>
-			  <artifactId>httpclient</artifactId>
-			  <version>4.3.1</version>
-		  </dependency>
-		  <dependency>
-			  <groupId>org.apache.httpcomponents</groupId>
-			  <artifactId>httpmime</artifactId>
-			  <version>4.3.1</version>
-		  </dependency>
 		</dependencies>
 	</dependencyManagement>
 </project>
diff --git a/deploy/pom.xml b/deploy/pom.xml
index a05ba2122bec..a0c30df20d3f 100644
--- a/deploy/pom.xml
+++ b/deploy/pom.xml
@@ -426,6 +426,21 @@
             <artifactId>commons-lang3</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <scope>compile</scope>
+        </dependency>
 
         <!-- hibernate -->
         <dependency>
diff --git a/master/pom.xml b/master/pom.xml
index 50307337c0d9..1e7b169d0761 100644
--- a/master/pom.xml
+++ b/master/pom.xml
@@ -90,6 +90,9 @@
     <sakai.hibernate.groupId>org.hibernate</sakai.hibernate.groupId>
     <sakai.hibernate.artifactId>hibernate-core</sakai.hibernate.artifactId>
     <sakai.hibernate.version>4.3.11.Final</sakai.hibernate.version>
+    <sakai.httpclient.version>4.5.3</sakai.httpclient.version>
+    <sakai.httpcore.version>4.4.7</sakai.httpcore.version>
+    <sakai.httpmime.version>4.5.3</sakai.httpmime.version>
     <sakai.jackson.version>2.8.6</sakai.jackson.version>
     <sakai.java.jwt.version>3.1.0</sakai.java.jwt.version>
     <sakai.jcr.version>1.0</sakai.jcr.version>
@@ -744,6 +747,24 @@
         <version>5.3.4.Final</version>
         <scope>provided</scope>
       </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpcore</artifactId>
+        <version>${sakai.httpcore.version}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>${sakai.httpclient.version}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpmime</artifactId>
+        <version>${sakai.httpmime.version}</version>
+        <scope>provided</scope>
+      </dependency>
       <dependency>
         <groupId>org.jboss.logging</groupId>
         <artifactId>jboss-logging</artifactId>
diff --git a/shortenedurl/pom.xml b/shortenedurl/pom.xml
index 144ae0fe6969..a78e9540965e 100755
--- a/shortenedurl/pom.xml
+++ b/shortenedurl/pom.xml
@@ -51,14 +51,6 @@
 				<scope>runtime</scope>
 	      	</dependency>
 		    
-		    <!-- external dependencies -->
-		    <dependency>
-				<groupId>org.apache.httpcomponents</groupId>
-				<artifactId>httpclient</artifactId>
-				<version>4.5.3</version>
-				<scope>compile</scope>
-			</dependency>
-
 			
 			<!-- java 1.5 requires this at compilation time for org.apache.http.impl.client.DefaultHttpClient -->
 			<dependency>