knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lmc...@apache.org
Subject knox git commit: KNOX-964 - upgrade to httpclient 4.5.3 to avoid licensing issues HTTPCLIENT-1743/LEGAL-240 (Jeffrey E Rodriguez via lmccay)
Date Wed, 28 Jun 2017 18:08:52 GMT
Repository: knox
Updated Branches:
  refs/heads/master 3004ba8b9 -> 47c27955f


KNOX-964 - upgrade to httpclient 4.5.3 to avoid licensing issues HTTPCLIENT-1743/LEGAL-240
(Jeffrey E Rodriguez via lmccay)

Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/47c27955
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/47c27955
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/47c27955

Branch: refs/heads/master
Commit: 47c27955f77f23b3b0c597b1c17598ca2ac69a8c
Parents: 3004ba8
Author: Larry McCay <lmccay@hortonworks.com>
Authored: Wed Jun 28 14:08:42 2017 -0400
Committer: Larry McCay <lmccay@hortonworks.com>
Committed: Wed Jun 28 14:08:42 2017 -0400

----------------------------------------------------------------------
 .../org/apache/hadoop/gateway/util/PrincipalCredentials.java  | 5 +++--
 .../hadoop/gateway/dispatch/CappedBufferHttpEntity.java       | 2 --
 .../org/apache/hadoop/gateway/dispatch/InputStreamEntity.java | 2 --
 .../gateway/dispatch/PartiallyRepeatableHttpEntity.java       | 2 --
 pom.xml                                                       | 7 +------
 5 files changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/47c27955/gateway-server/src/main/java/org/apache/hadoop/gateway/util/PrincipalCredentials.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/util/PrincipalCredentials.java
b/gateway-server/src/main/java/org/apache/hadoop/gateway/util/PrincipalCredentials.java
index ac315db..6875614 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/util/PrincipalCredentials.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/util/PrincipalCredentials.java
@@ -20,8 +20,9 @@ package org.apache.hadoop.gateway.util;
 import java.io.Serializable;
 import java.security.Principal;
 
-import org.apache.http.annotation.Immutable;
 
+import org.apache.http.annotation.ThreadingBehavior;
+import org.apache.http.annotation.Contract;
 import org.apache.http.auth.BasicUserPrincipal;
 import org.apache.http.auth.Credentials;
 import org.apache.http.util.LangUtils;
@@ -32,7 +33,7 @@ import org.apache.http.util.LangUtils;
  *
  * @since 4.0
  */
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
 public class PrincipalCredentials implements Credentials, Serializable {
 
   private final Principal principal;

http://git-wip-us.apache.org/repos/asf/knox/blob/47c27955/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/CappedBufferHttpEntity.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/CappedBufferHttpEntity.java
b/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/CappedBufferHttpEntity.java
index d5f7563..e3f61d5 100644
--- a/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/CappedBufferHttpEntity.java
+++ b/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/CappedBufferHttpEntity.java
@@ -19,14 +19,12 @@ package org.apache.hadoop.gateway.dispatch;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpEntity;
-import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.entity.HttpEntityWrapper;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-@NotThreadSafe
 public class CappedBufferHttpEntity extends HttpEntityWrapper {
 
   public static final int DEFAULT_BUFFER_SIZE = 4096;

http://git-wip-us.apache.org/repos/asf/knox/blob/47c27955/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/InputStreamEntity.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/InputStreamEntity.java
b/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/InputStreamEntity.java
index 7cde693..d57e0a1 100644
--- a/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/InputStreamEntity.java
+++ b/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/InputStreamEntity.java
@@ -26,7 +26,6 @@
  */
 package org.apache.hadoop.gateway.dispatch;
 
-import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.entity.AbstractHttpEntity;
 import org.apache.http.entity.ContentType;
 import org.apache.http.util.Args;
@@ -39,7 +38,6 @@ import java.io.OutputStream;
  * A streamed, non-repeatable entity that obtains its content froman {@link InputStream}.
  * Copied from HttpClient source in order to increase buffer size.
  */
-@NotThreadSafe
 public class InputStreamEntity extends AbstractHttpEntity {
 
   // A value of 16K results in a significant performance improvement due to better HTTP chunking
on the wire.

http://git-wip-us.apache.org/repos/asf/knox/blob/47c27955/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/PartiallyRepeatableHttpEntity.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/PartiallyRepeatableHttpEntity.java
b/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/PartiallyRepeatableHttpEntity.java
index fef05f2..f2040cd 100644
--- a/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/PartiallyRepeatableHttpEntity.java
+++ b/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/PartiallyRepeatableHttpEntity.java
@@ -19,14 +19,12 @@ package org.apache.hadoop.gateway.dispatch;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpEntity;
-import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.entity.HttpEntityWrapper;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-@NotThreadSafe
 public class PartiallyRepeatableHttpEntity extends HttpEntityWrapper {
 
   public static final int DEFAULT_BUFFER_SIZE = 4096;

http://git-wip-us.apache.org/repos/asf/knox/blob/47c27955/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 56a2e8e..26cc41f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -818,13 +818,8 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>4.5.1</version>
+                <version>4.5.3</version>
             </dependency>
-            <!-- dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpcore</artifactId>
-                <version>4.4.6</version>
-            </dependency-->
             <dependency>
                 <groupId>joda-time</groupId>
                 <artifactId>joda-time</artifactId>


Mime
View raw message