You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by ch...@apache.org on 2023/03/03 03:17:03 UTC
[kyuubi] branch branch-1.7 updated: [KYUUBI #4437] [Authz] Fix dependencies conflict by replacing `jersey-bundle` with `jersey-client`
This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch branch-1.7
in repository https://gitbox.apache.org/repos/asf/kyuubi.git
The following commit(s) were added to refs/heads/branch-1.7 by this push:
new 6dc5fe577 [KYUUBI #4437] [Authz] Fix dependencies conflict by replacing `jersey-bundle` with `jersey-client`
6dc5fe577 is described below
commit 6dc5fe57743c4e72a856c1e4241b82efc216debc
Author: liangbowen <li...@gf.com.cn>
AuthorDate: Fri Mar 3 11:16:10 2023 +0800
[KYUUBI #4437] [Authz] Fix dependencies conflict by replacing `jersey-bundle` with `jersey-client`
### _Why are the changes needed?_
- `jerysey-bundle` 1.x , which is depended by `ranger-plugins-common`, contains `javax.ws.rs.*` (like `javax.ws.rs.core.*`) packages that conflicted to `jarkarta.ws.rs-api-2.1.6.jar` in Spark 3.0+ jars
- exclude `jerysey-bundle` 1.x and include `jersey-client` 1.19.4 to align with `ranger-plugins-common`
Diff in Authz dependency jar list:
```diff
gethostname4j-1.0.0.jar
jackson-jaxrs-1.9.13.jar
- jersey-bundle-1.19.3.jar
+ jersey-client-1.19.4.jar
+ jersey-core-1.19.4.jar
jetty-client-9.4.50.v20221201.jar
jetty-http-9.4.50.v20221201.jar
jetty-io-9.4.50.v20221201.jar
jetty-util-9.4.50.v20221201.jar
jna-5.7.0.jar
jna-platform-5.7.0.jar
ranger-plugins-audit-2.3.0.jar
ranger-plugins-common-2.3.0.jar
ranger-plugins-cred-2.3.0.jar
```
### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible
- [ ] Add screenshots for manual tests if appropriate
- [ ] [Run test](https://kyuubi.readthedocs.io/en/master/develop_tools/testing.html#running-tests) locally before make a pull request
Closes #4437 from bowenliang123/authz-jerseyclient.
Closes #4437
23e7eed5a [liangbowen] fixing conflicts in `javax.ws.rs.*`packages by excluding `jersey-bundle` and including `jersey-client` with `jsr311-api` excluded
Authored-by: liangbowen <li...@gf.com.cn>
Signed-off-by: Cheng Pan <ch...@apache.org>
(cherry picked from commit 355ed803b6d8b55c7b076640d48fcf01b951782f)
Signed-off-by: Cheng Pan <ch...@apache.org>
---
extensions/spark/kyuubi-spark-authz/pom.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/extensions/spark/kyuubi-spark-authz/pom.xml b/extensions/spark/kyuubi-spark-authz/pom.xml
index a85e9c803..67c83fef1 100644
--- a/extensions/spark/kyuubi-spark-authz/pom.xml
+++ b/extensions/spark/kyuubi-spark-authz/pom.xml
@@ -32,7 +32,9 @@
<url>https://kyuubi.apache.org/</url>
<properties>
+ <!-- the following components' version may need to tune to align w/ the ranger.version-->
<gethostname4j.version>1.0.0</gethostname4j.version>
+ <jersey.client.version>1.19.4</jersey.client.version>
<jna.version>5.7.0</jna.version>
</properties>
@@ -42,6 +44,10 @@
<artifactId>ranger-plugins-common</artifactId>
<version>${ranger.version}</version>
<exclusions>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-bundle</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.apache.ranger</groupId>
<artifactId>ranger-plugin-classloader</artifactId>
@@ -101,6 +107,18 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>${jersey.client.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>com.kstruct</groupId>
<artifactId>gethostname4j</artifactId>