You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by pr...@apache.org on 2020/12/19 14:14:30 UTC
[ranger] branch master updated: RANGER-3100: Upgrade httpclient
version from 4.5.6 to 4.5.14
This is an automated email from the ASF dual-hosted git repository.
pradeep pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new 8d3a459 RANGER-3100: Upgrade httpclient version from 4.5.6 to 4.5.14
8d3a459 is described below
commit 8d3a4592b5183d7bf767233045083d7212ade570
Author: pradeep <pr...@apache.org>
AuthorDate: Sat Dec 5 00:10:44 2020 +0530
RANGER-3100: Upgrade httpclient version from 4.5.6 to 4.5.14
---
agents-audit/pom.xml | 5 +++++
distro/src/main/assembly/admin-web.xml | 8 ++++----
pom.xml | 8 ++++----
ranger-elasticsearch-plugin-shim/pom.xml | 10 ++++++++++
security-admin/pom.xml | 25 +++++++++++++++++++++++++
5 files changed, 48 insertions(+), 8 deletions(-)
diff --git a/agents-audit/pom.xml b/agents-audit/pom.xml
index d2e7098..f026a0a 100644
--- a/agents-audit/pom.xml
+++ b/agents-audit/pom.xml
@@ -274,5 +274,10 @@
<artifactId>log4j-api</artifactId>
<version>${log4j.core.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcomponents.httpcore.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/distro/src/main/assembly/admin-web.xml b/distro/src/main/assembly/admin-web.xml
index 3a438d7..95c1ac6 100644
--- a/distro/src/main/assembly/admin-web.xml
+++ b/distro/src/main/assembly/admin-web.xml
@@ -238,11 +238,11 @@
<include>commons-lang:commons-lang</include>
<include>commons-io:commons-io</include>
<include>org.apache.solr:solr-solrj</include>
- <include>org.apache.httpcomponents:httpclient</include>
- <include>org.apache.httpcomponents:httpcore</include>
+ <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
+ <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
<include>org.noggit:noggit</include>
<include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
- <include>org.apache.httpcomponents:httpmime</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>commons-codec:commons-codec</include>
<include>org.apache.htrace:htrace-core4:jar:${htrace-core.version}</include>
<include>com.fasterxml.woodstox:woodstox-core:jar:${fasterxml.woodstox.version}</include>
@@ -260,7 +260,7 @@
<include>org.elasticsearch:elasticsearch</include>
<include>org.elasticsearch.plugin:lang-mustache-client</include>
<include>org.elasticsearch.plugin:rank-eval-client</include>
- <include>org.apache.httpcomponents:httpasyncclient</include>
+ <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
<include>org.apache.httpcomponents:httpcore-nio</include>
<include>com.fasterxml.jackson.core:jackson-core</include>
<include>org.apache.logging.log4j:log4j-core</include>
diff --git a/pom.xml b/pom.xml
index 6f7114c..0fcecbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,10 +129,10 @@
<libfb303.version>0.9.3</libfb303.version>
<libthrift.version>0.13.0</libthrift.version>
<htrace-core.version>4.1.0-incubating</htrace-core.version>
- <httpcomponents.httpclient.version>4.5.6</httpcomponents.httpclient.version>
- <httpcomponents.httpcore.version>4.4.6</httpcomponents.httpcore.version>
- <httpcomponents.httpasyncclient.version>4.1.3</httpcomponents.httpasyncclient.version>
- <httpcomponents.httpmime.version>4.5.6</httpcomponents.httpmime.version>
+ <httpcomponents.httpclient.version>4.5.13</httpcomponents.httpclient.version>
+ <httpcomponents.httpcore.version>4.4.14</httpcomponents.httpcore.version>
+ <httpcomponents.httpasyncclient.version>4.1.4</httpcomponents.httpasyncclient.version>
+ <httpcomponents.httpmime.version>4.5.13</httpcomponents.httpmime.version>
<javax.persistence.version>2.1.0</javax.persistence.version>
<javax.servlet.version>3.1.0</javax.servlet.version>
<javax-inject.version>1</javax-inject.version>
diff --git a/ranger-elasticsearch-plugin-shim/pom.xml b/ranger-elasticsearch-plugin-shim/pom.xml
index c40c4b8..c788d5e 100644
--- a/ranger-elasticsearch-plugin-shim/pom.xml
+++ b/ranger-elasticsearch-plugin-shim/pom.xml
@@ -62,5 +62,15 @@
<version>${slf4j-api.version}</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpcomponents.httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcomponents.httpcore.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/security-admin/pom.xml b/security-admin/pom.xml
index 865a42e..86e46b9 100644
--- a/security-admin/pom.xml
+++ b/security-admin/pom.xml
@@ -590,6 +590,31 @@
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpcomponents.httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcomponents.httpcore.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpasyncclient</artifactId>
+ <version>${httpcomponents.httpasyncclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>${httpcomponents.httpmime.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-nio</artifactId>
+ <version>${httpcomponents.httpcore.version}</version>
+ </dependency>
</dependencies>
<build>
<pluginManagement>