[ranger] branch master updated: RANGER-2581: Ranger solr plugin fails to connect to SSL enabled Ranger

[pradeep]

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 5523d16  RANGER-2581: Ranger solr plugin fails to connect to SSL 
enabled Ranger
5523d16 is described below

commit 5523d16cb1e4612a98af0d5a93842edbb011853a
Author: Pradeep <prad...@apache.org>
AuthorDate: Fri Sep 20 15:12:51 2019 +0530

    RANGER-2581: Ranger solr plugin fails to connect to SSL enabled Ranger
---
 .../src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java  | 3 +--
 src/main/assembly/admin-web.xml                                        | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
 
b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
index 5a7596f..ef9e5ae 100644
--- 
a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
+++ 
b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
@@ -44,7 +44,6 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.Validate;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configuration;
 import org.apache.ranger.authorization.hadoop.config.RangerConfiguration;
 import org.apache.ranger.authorization.hadoop.utils.RangerCredentialProvider;
 import org.apache.ranger.authorization.utils.StringUtil;
@@ -240,7 +239,7 @@ public class RangerRESTClient {
                        InputStream in = null;
 
                        try {
-                               Configuration conf = new Configuration();
+                               RangerConfiguration conf = 
RangerConfiguration.getInstance();
 
                                in = getFileInputStream(mSslConfigFileName);
 
diff --git a/src/main/assembly/admin-web.xml b/src/main/assembly/admin-web.xml
index 449a112..4658f87 100644
--- a/src/main/assembly/admin-web.xml
+++ b/src/main/assembly/admin-web.xml
@@ -265,6 +265,7 @@
                     
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
                     <include>net.java.dev.jna:jna:jar:${jna.version}</include>
                     
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
+                    <include>org.apache.ranger:ranger-plugins-cred</include>
                 </includes>
                 <unpack>false</unpack>
             </dependencySet>