Skip to content

Commit 355ed80

Browse files
bowenliang123pan3793
authored andcommitted
[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 23e7eed [liangbowen] fixing conflicts in `javax.ws.rs.*`packages by excluding `jersey-bundle` and including `jersey-client` with `jsr311-api` excluded Authored-by: liangbowen <liangbowen@gf.com.cn> Signed-off-by: Cheng Pan <chengpan@apache.org>
1 parent 5fab9b7 commit 355ed80

File tree

1 file changed

+18
-0
lines changed
  • extensions/spark/kyuubi-spark-authz

1 file changed

+18
-0
lines changed

extensions/spark/kyuubi-spark-authz/pom.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
<url>https://kyuubi.apache.org/</url>
3333

3434
<properties>
35+
<!-- the following components' version may need to tune to align w/ the ranger.version-->
3536
<gethostname4j.version>1.0.0</gethostname4j.version>
37+
<jersey.client.version>1.19.4</jersey.client.version>
3638
<jna.version>5.7.0</jna.version>
3739
</properties>
3840

@@ -42,6 +44,10 @@
4244
<artifactId>ranger-plugins-common</artifactId>
4345
<version>${ranger.version}</version>
4446
<exclusions>
47+
<exclusion>
48+
<groupId>com.sun.jersey</groupId>
49+
<artifactId>jersey-bundle</artifactId>
50+
</exclusion>
4551
<exclusion>
4652
<groupId>org.apache.ranger</groupId>
4753
<artifactId>ranger-plugin-classloader</artifactId>
@@ -101,6 +107,18 @@
101107
</exclusions>
102108
</dependency>
103109

110+
<dependency>
111+
<groupId>com.sun.jersey</groupId>
112+
<artifactId>jersey-client</artifactId>
113+
<version>${jersey.client.version}</version>
114+
<exclusions>
115+
<exclusion>
116+
<groupId>javax.ws.rs</groupId>
117+
<artifactId>jsr311-api</artifactId>
118+
</exclusion>
119+
</exclusions>
120+
</dependency>
121+
104122
<dependency>
105123
<groupId>com.kstruct</groupId>
106124
<artifactId>gethostname4j</artifactId>

0 commit comments

Comments
 (0)