From 7459fac3b699f825287bb30dc142bcd9ca0a7a41 Mon Sep 17 00:00:00 2001 From: liangbowen Date: Thu, 5 Jan 2023 01:48:36 +0000 Subject: [PATCH] [KYUUBI #4082] Bump Jersey from 2.36 to 2.38 ### _Why are the changes needed?_ Release notes for Jersey: - https://github.com/eclipse-ee4j/jersey/releases/tag/2.38 - https://github.com/eclipse-ee4j/jersey/releases/tag/2.37 Changes in this PR: - `jakarta.activation-api` is now removed from `dependencyList` - `jakarta.activation-api` added to `kyuubi-kubernetes-it` module's dependency in test scope for satisfying `hadoop-client-minicluster` Facts: - Before : with jersey 2.36, - `kyuubi-kubernetes-it` relies on `hadoop-client-minicluster` in test scope - `hadoop-client-minicluster` uses `DataSource` and other classes in package `javax.activation` without depending on the depencency - `javax.activation` package is actually provied by `jakarta.activation-api` included by `jersey-media-json-jackson` - Investigation: with jersey 2.38 - `jakarta.activation-api` was removed in Jersey 2.38 compared to 2.36 (https://github.com/eclipse-ee4j/jersey/compare/2.36...2.38) - from the blame history, it's clear that `jakarta.activation-api` was explictly excluded from `jersey-media-json-jackson` (https://github.com/eclipse-ee4j/jersey/blob/2.38/media/json-jackson/pom.xml), which in order to apply changes from `maven-enforcer-plugin` in (https://github.com/eclipse-ee4j/jersey/commit/7e7d33928141437fc0448e3f352d513dc2a0ea6d#diff-f47eb7c28b888c017334e057492d4d2eab5be3e0e02bea1ff10765542bf9b9c8R101) - Solution: - added `jakarta.activation-api` to `kyuubi-kubernetes-it` module's dependency in test scope statisfying `hadoop-client-minicluster` - confirm `jakarta.activation-api` is no longer directly or indirectly dependent in maven runtime scope ### _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 - [x] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request Closes #4082 from bowenliang123/jersey-2.38. Closes #4082 88c7cd80 [liangbowen] move jakarta.activation-api dependency closer to its dependant hadoop-client-minicluster ce6df817 [liangbowen] add jakarta.activation-api dependency in test scope to kubernetes-integration-tests_2.1 module 8422dc2f [Bowen Liang] Merge branch 'master' into jersey-2.38 606cad0a [liangbowen] Bump Jersey from 2.36 to 2.38 Lead-authored-by: liangbowen Co-authored-by: Bowen Liang Signed-off-by: Cheng Pan --- dev/dependencyList | 15 +++++++-------- integration-tests/kyuubi-kubernetes-it/pom.xml | 6 ++++++ pom.xml | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dev/dependencyList b/dev/dependencyList index 86b350aa3..275914f83 100644 --- a/dev/dependencyList +++ b/dev/dependencyList @@ -72,7 +72,6 @@ jackson-jaxrs-base/2.14.1//jackson-jaxrs-base-2.14.1.jar jackson-jaxrs-json-provider/2.14.1//jackson-jaxrs-json-provider-2.14.1.jar jackson-module-jaxb-annotations/2.14.1//jackson-module-jaxb-annotations-2.14.1.jar jackson-module-scala_2.12/2.14.1//jackson-module-scala_2.12-2.14.1.jar -jakarta.activation-api/1.2.1//jakarta.activation-api-1.2.1.jar jakarta.annotation-api/1.3.5//jakarta.annotation-api-1.3.5.jar jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar jakarta.servlet-api/4.0.4//jakarta.servlet-api-4.0.4.jar @@ -81,13 +80,13 @@ jakarta.ws.rs-api/2.1.6//jakarta.ws.rs-api-2.1.6.jar jakarta.xml.bind-api/2.3.2//jakarta.xml.bind-api-2.3.2.jar javassist/3.25.0-GA//javassist-3.25.0-GA.jar jcl-over-slf4j/1.7.36//jcl-over-slf4j-1.7.36.jar -jersey-client/2.36//jersey-client-2.36.jar -jersey-common/2.36//jersey-common-2.36.jar -jersey-container-servlet-core/2.36//jersey-container-servlet-core-2.36.jar -jersey-entity-filtering/2.36//jersey-entity-filtering-2.36.jar -jersey-hk2/2.36//jersey-hk2-2.36.jar -jersey-media-json-jackson/2.36//jersey-media-json-jackson-2.36.jar -jersey-server/2.36//jersey-server-2.36.jar +jersey-client/2.38//jersey-client-2.38.jar +jersey-common/2.38//jersey-common-2.38.jar +jersey-container-servlet-core/2.38//jersey-container-servlet-core-2.38.jar +jersey-entity-filtering/2.38//jersey-entity-filtering-2.38.jar +jersey-hk2/2.38//jersey-hk2-2.38.jar +jersey-media-json-jackson/2.38//jersey-media-json-jackson-2.38.jar +jersey-server/2.38//jersey-server-2.38.jar jetcd-api/0.7.3//jetcd-api-0.7.3.jar jetcd-common/0.7.3//jetcd-common-0.7.3.jar jetcd-core/0.7.3//jetcd-core-0.7.3.jar diff --git a/integration-tests/kyuubi-kubernetes-it/pom.xml b/integration-tests/kyuubi-kubernetes-it/pom.xml index 97357c726..cb04e73c1 100644 --- a/integration-tests/kyuubi-kubernetes-it/pom.xml +++ b/integration-tests/kyuubi-kubernetes-it/pom.xml @@ -74,6 +74,12 @@ test + + jakarta.activation + jakarta.activation-api + test + + commons-io commons-io diff --git a/pom.xml b/pom.xml index 996988f9c..3f3ec2f55 100644 --- a/pom.xml +++ b/pom.xml @@ -161,7 +161,7 @@ 4.0.4 2.3.2 1.2.1 - 2.36 + 2.38 9.4.50.v20221201 0.9.94 4.13.1