You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by bp...@apache.org on 2022/06/23 11:18:07 UTC
[ranger] branch master updated: RANGER-3165:Upgrade Elasticsearch version in Ranger to Elasticsearch 7.10.2
This is an automated email from the ASF dual-hosted git repository.
bpatel 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 83b7d0fe0 RANGER-3165:Upgrade Elasticsearch version in Ranger to Elasticsearch 7.10.2
83b7d0fe0 is described below
commit 83b7d0fe0b158d73d54bca24d122994c94f82117
Author: Bhavik Patel <bh...@gmail.com>
AuthorDate: Wed May 11 20:38:47 2022 +0530
RANGER-3165:Upgrade Elasticsearch version in Ranger to Elasticsearch 7.10.2
---
pom.xml | 2 +-
.../elasticsearch/plugin/RangerElasticsearchPlugin.java | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 12378a5b0..ce00aced6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,7 @@
<derby.version>10.11.1.1</derby.version>
<dnsjava.version>2.1.7</dnsjava.version>
<eclipse.jpa.version>2.5.2</eclipse.jpa.version>
- <elasticsearch.version>7.6.0</elasticsearch.version>
+ <elasticsearch.version>7.10.2</elasticsearch.version>
<enunciate.version>2.13.2</enunciate.version>
<spotbugs.plugin.version>4.5.0.0</spotbugs.plugin.version>
<google.guava.version>27.0-jre</google.guava.version>
diff --git a/ranger-elasticsearch-plugin-shim/src/main/java/org/apache/ranger/authorization/elasticsearch/plugin/RangerElasticsearchPlugin.java b/ranger-elasticsearch-plugin-shim/src/main/java/org/apache/ranger/authorization/elasticsearch/plugin/RangerElasticsearchPlugin.java
index b196b0fa4..2af13f87f 100644
--- a/ranger-elasticsearch-plugin-shim/src/main/java/org/apache/ranger/authorization/elasticsearch/plugin/RangerElasticsearchPlugin.java
+++ b/ranger-elasticsearch-plugin-shim/src/main/java/org/apache/ranger/authorization/elasticsearch/plugin/RangerElasticsearchPlugin.java
@@ -25,12 +25,14 @@ import java.nio.file.Path;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.function.Supplier;
import java.util.function.UnaryOperator;
import org.apache.ranger.authorization.elasticsearch.plugin.action.filter.RangerSecurityActionFilter;
import org.apache.ranger.authorization.elasticsearch.plugin.rest.filter.RangerSecurityRestFilter;
import org.elasticsearch.action.support.ActionFilter;
import org.elasticsearch.client.Client;
+import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.settings.Settings;
@@ -40,6 +42,7 @@ import org.elasticsearch.env.Environment;
import org.elasticsearch.env.NodeEnvironment;
import org.elasticsearch.plugins.ActionPlugin;
import org.elasticsearch.plugins.Plugin;
+import org.elasticsearch.repositories.RepositoriesService;
import org.elasticsearch.rest.RestHandler;
import org.elasticsearch.script.ScriptService;
import org.elasticsearch.threadpool.ThreadPool;
@@ -77,7 +80,9 @@ public class RangerElasticsearchPlugin extends Plugin implements ActionPlugin {
final ThreadPool threadPool, final ResourceWatcherService resourceWatcherService,
final ScriptService scriptService, final NamedXContentRegistry xContentRegistry,
final Environment environment, final NodeEnvironment nodeEnvironment,
- final NamedWriteableRegistry namedWriteableRegistry) {
+ final NamedWriteableRegistry namedWriteableRegistry,
+ IndexNameExpressionResolver indexNameExpressionResolver,
+ Supplier<RepositoriesService> repositoriesServiceSupplier) {
addPluginConfig2Classpath(environment);