SAK-44463 Update Apache httpcore 5.0 & HttpClient 5.0 (sakaiproject#8683

)
susowrc · Dec 3, 2020 · b842c76 · b842c76
1 parent 0a5568d
commit b842c76
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 23 deletions.
diff --git a/cloud-storage/onedrive/api/pom.xml b/cloud-storage/onedrive/api/pom.xml
@@ -30,7 +30,6 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>${sakai.jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -40,12 +39,6 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>${sakai.commons.lang3.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>${sakai.httpclient.version}</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>

diff --git a/cloud-storage/onedrive/impl/pom.xml b/cloud-storage/onedrive/impl/pom.xml
@@ -74,12 +74,12 @@
             <artifactId>commons-io</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
+           <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
+          <groupId>org.apache.httpcomponents.core5</groupId>
+          <artifactId>httpcore5</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>

diff --git a/...storage/onedrive/impl/src/java/org/sakaiproject/onedrive/service/OneDriveServiceImpl.java b/...storage/onedrive/impl/src/java/org/sakaiproject/onedrive/service/OneDriveServiceImpl.java
@@ -29,8 +29,8 @@
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.NameValuePair;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.io.entity.StringEntity;
 import org.sakaiproject.component.api.ServerConfigurationService;
 import org.sakaiproject.memory.api.Cache;
 import org.sakaiproject.memory.api.MemoryService;

diff --git a/cloud-storage/onedrive/impl/src/java/org/sakaiproject/onedrive/util/HTTPConnectionUtil.java b/cloud-storage/onedrive/impl/src/java/org/sakaiproject/onedrive/util/HTTPConnectionUtil.java
@@ -23,16 +23,16 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.classic.methods.HttpGet;
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.io.entity.StringEntity;
+import org.apache.hc.core5.net.URIBuilder;
 
 /**
  * HTTP methods required by the service

diff --git a/deploy/pom.xml b/deploy/pom.xml
@@ -521,6 +521,16 @@
             <artifactId>httpmime</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+        <groupId>org.apache.httpcomponents.core5</groupId>
+        <artifactId>httpcore5</artifactId>
+        <scope>compile</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents.client5</groupId>
+        <artifactId>httpclient5</artifactId>
+        <scope>compile</scope>
+      </dependency>
 
         <!-- hibernate -->
         <dependency>

diff --git a/master/pom.xml b/master/pom.xml
@@ -40,6 +40,8 @@
     <sakai.httpclient.version>4.5.13</sakai.httpclient.version>
     <sakai.httpcore.version>4.4.13</sakai.httpcore.version>
     <sakai.httpmime.version>4.5.13</sakai.httpmime.version>
+    <sakai.httpclient5.version>5.0.3</sakai.httpclient5.version>
+    <sakai.httpcore5.version>5.0.2</sakai.httpcore5.version>
     <sakai.ignite.version>2.8.1</sakai.ignite.version>
     <sakai.gridgain.version>8.7.18</sakai.gridgain.version>
     <sakai.jackson.version>2.11.2</sakai.jackson.version>
@@ -903,6 +905,19 @@
         <version>${sakai.httpclient.version}</version>
         <scope>provided</scope>
       </dependency>
+      <!-- httpcore5 & httpclient5 -->
+      <dependency>
+        <groupId>org.apache.httpcomponents.core5</groupId>
+        <artifactId>httpcore5</artifactId>
+        <version>${sakai.httpcore5.version}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents.client5</groupId>
+        <artifactId>httpclient5</artifactId>
+        <version>${sakai.httpclient5.version}</version>
+        <scope>provided</scope>
+      </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpmime</artifactId>