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 2021/12/15 04:02:34 UTC
[incubator-kyuubi] branch branch-1.4 updated: [KYUUBI #1560] Align all Jackson libs version
This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch branch-1.4
in repository https://gitbox.apache.org/repos/asf/incubator-kyuubi.git
The following commit(s) were added to refs/heads/branch-1.4 by this push:
new 786dfcb [KYUUBI #1560] Align all Jackson libs version
786dfcb is described below
commit 786dfcbdd3c72a202bb13b5e5beebde4bb56dddb
Author: Cheng Pan <ch...@apache.org>
AuthorDate: Wed Dec 15 12:02:10 2021 +0800
[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 <ch...@apache.org>
Signed-off-by: Cheng Pan <ch...@apache.org>
(cherry picked from commit 6fa1327f4e58ca79e7c07f8e089d6ca312b323c9)
Signed-off-by: Cheng Pan <ch...@apache.org>
---
dev/dependencyList | 6 +++---
pom.xml | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/dev/dependencyList b/dev/dependencyList
index 75d5a7a..c395b53 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 e70ea47..6ab7585 100644
--- a/pom.xml
+++ b/pom.xml
@@ -604,6 +604,22 @@
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
+ <version>${jackson.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jakarta.activation-api</artifactId>
+ <groupId>jakarta.activation</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
<version>${jackson.version}</version>
</dependency>
@@ -635,6 +651,12 @@
<groupId>com.github.swagger-akka-http</groupId>
<artifactId>swagger-scala-module_${scala.binary.version}</artifactId>
<version>${swagger.scala.module.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -902,6 +924,18 @@
<!-- RESTful service required -->
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-common</artifactId>
+ <version>${jersey.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<version>${jersey.version}</version>
<exclusions>