This is an automated email from the ASF dual-hosted git repository.
liuxun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push:
new fe7049d SUBMARINE-465. shade gethostname jar for spark-security
ranger2.0 plugin
fe7049d is described below
commit fe7049d2d5d48d6a3cc02c5b939a140873c5380d
Author: Kent Yao <[email protected]>
AuthorDate: Fri Apr 10 11:06:16 2020 +0800
SUBMARINE-465. shade gethostname jar for spark-security ranger2.0 plugin
### What is this PR for?
`gethostname` jar is depended by ranger-2.0 common plugin, this PR shade it
to the uber jar
### What type of PR is it?
Improvement
### Todos
* [ ] - Task
### What is the Jira issue?
https://issues.apache.org/jira/browse/SUBMARINE-465
### How should this be tested?
pass ci
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Kent Yao <[email protected]>
Closes #258 from yaooqinn/SUBMARINE-465 and squashes the following commits:
4be5c9a [Kent Yao] SUBMARINE-465. shade gethostname jar for spark-security
ranger2.0 plugin
---
submarine-security/spark-security/pom.xml | 36 +++++++++++++++++++++++++++++--
1 file changed, 34 insertions(+), 2 deletions(-)
diff --git a/submarine-security/spark-security/pom.xml
b/submarine-security/spark-security/pom.xml
index a03eabe..bc696f5 100644
--- a/submarine-security/spark-security/pom.xml
+++ b/submarine-security/spark-security/pom.xml
@@ -50,6 +50,11 @@
<solr.version>5.5.4</solr.version>
<spark.version>2.3.4</spark.version>
<spark.scope>provided</spark.scope>
+ <gethostname4j.version>0.0.2</gethostname4j.version>
+ <gethostname4j.scope>test</gethostname4j.scope>
+ <jna.version>5.2.0</jna.version>
+ <jna-platform.version>5.2.0</jna-platform.version>
+ <jna.scope>test</jna.scope>
</properties>
<dependencies>
<dependency>
@@ -254,8 +259,22 @@
<dependency>
<groupId>com.kstruct</groupId>
<artifactId>gethostname4j</artifactId>
- <version>0.0.2</version>
- <scope>test</scope>
+ <version>${gethostname4j.version}</version>
+ <scope>${gethostname4j.scope}</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>${jna.version}</version>
+ <scope>${jna.scope}</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna-platform</artifactId>
+ <version>${jna-platform.version}</version>
+ <scope>${jna.scope}</scope>
</dependency>
</dependencies>
@@ -329,6 +348,9 @@
<includes>
<include>com.google.code.gson:gson</include>
<include>com.sun.jersey:jersey-bundle</include>
+ <include>com.kstruct:gethostname4j</include>
+ <include>net.java.dev.jna:jna</include>
+ <include>net.java.dev.jna:jna-platform</include>
<include>org.apache.httpcomponents:httpclient</include>
<include>org.apache.httpcomponents:httpcore</include>
<include>org.apache.httpcomponents:httpmime</include>
@@ -366,6 +388,14 @@
<shadedPattern>${ranger.spark.package}.com.sun.research</shadedPattern>
</relocation>
<relocation>
+ <pattern>com.kstruct</pattern>
+
<shadedPattern>${ranger.spark.package}.com.kstruct</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.sun.jna</pattern>
+
<shadedPattern>${ranger.spark.package}.com.sun.jna</shadedPattern>
+ </relocation>
+ <relocation>
<pattern>com.sun.ws</pattern>
<shadedPattern>${ranger.spark.package}.com.sun.ws</shadedPattern>
</relocation>
@@ -532,6 +562,8 @@
<httpcomponents.httpmime.version>4.5.3</httpcomponents.httpmime.version>
<ranger.version>2.0.0</ranger.version>
<solr.version>7.7.1</solr.version>
+ <gethostname4j.scope>compile</gethostname4j.scope>
+ <jna.scope>compile</jna.scope>
</properties>
</profile>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
