From 786dfcbdd3c72a202bb13b5e5beebde4bb56dddb Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Wed, 15 Dec 2021 12:02:10 +0800 Subject: [PATCH] [KYUUBI #1560] Align all Jackson libs version ### _Why are the changes needed?_ Fix missing version of `jackson-module-jaxb-annotations` in `dependencyManagement` ### _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.readthedocs.io/en/latest/develop_tools/testing.html#running-tests) locally before make a pull request Closes #1560 from pan3793/jackson-1. Closes #1560 49529d47 [Cheng Pan] Update deps b3610007 [Cheng Pan] fix 67044840 [Cheng Pan] Algin all Jackson libs version Authored-by: Cheng Pan Signed-off-by: Cheng Pan (cherry picked from commit 6fa1327f4e58ca79e7c07f8e089d6ca312b323c9) Signed-off-by: Cheng Pan --- dev/dependencyList | 6 +++--- pom.xml | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dev/dependencyList b/dev/dependencyList index 75d5a7a20..c395b53a0 100644 --- a/dev/dependencyList +++ b/dev/dependencyList @@ -44,16 +44,16 @@ jackson-dataformat-yaml/2.11.4//jackson-dataformat-yaml-2.11.4.jar jackson-datatype-jsr310/2.11.4//jackson-datatype-jsr310-2.11.4.jar jackson-jaxrs-base/2.11.4//jackson-jaxrs-base-2.11.4.jar jackson-jaxrs-json-provider/2.11.4//jackson-jaxrs-json-provider-2.11.4.jar -jackson-module-jaxb-annotations/2.9.9//jackson-module-jaxb-annotations-2.9.9.jar +jackson-module-jaxb-annotations/2.11.4//jackson-module-jaxb-annotations-2.11.4.jar jackson-module-paranamer/2.11.4//jackson-module-paranamer-2.11.4.jar jackson-module-scala_2.12/2.11.4//jackson-module-scala_2.12-2.11.4.jar -jakarta.activation/2.0.0//jakarta.activation-2.0.0.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 jakarta.validation-api/2.0.2//jakarta.validation-api-2.0.2.jar jakarta.ws.rs-api/2.1.6//jakarta.ws.rs-api-2.1.6.jar -jakarta.xml.bind-api/3.0.0//jakarta.xml.bind-api-3.0.0.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 jaxb-api/2.2.11//jaxb-api-2.2.11.jar jcl-over-slf4j/1.7.30//jcl-over-slf4j-1.7.30.jar diff --git a/pom.xml b/pom.xml index e70ea4784..6ab758580 100644 --- a/pom.xml +++ b/pom.xml @@ -602,6 +602,22 @@ ${jackson.version} + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson.version} + + + jakarta.xml.bind-api + jakarta.xml.bind + + + jakarta.activation-api + jakarta.activation + + + + com.fasterxml.jackson.module jackson-module-scala_${scala.binary.version} @@ -635,6 +651,12 @@ com.github.swagger-akka-http swagger-scala-module_${scala.binary.version} ${swagger.scala.module.version} + + + jakarta.xml.bind-api + jakarta.xml.bind + + @@ -900,6 +922,18 @@ + + org.glassfish.jersey.core + jersey-common + ${jersey.version} + + + com.sun.activation + jakarta.activation + + + + org.glassfish.jersey.core jersey-server