Skip to content

Commit 839c5c5

Browse files
committed
[KYUUBI #1861] Migrate bind-api and activation-api from javax to jakarta
### _Why are the changes needed?_ The Java world is migrating JavaEE components from `javax` to `jakarta`, we should follow it. ### _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 #1861 from pan3793/jaxb. Closes #1861 3563b77 [Cheng Pan] Migrate bind-api activation-api to jakarta Authored-by: Cheng Pan <chengpan@apache.org> Signed-off-by: Cheng Pan <chengpan@apache.org>
1 parent dd4ae3f commit 839c5c5

File tree

7 files changed

+18
-29
lines changed

7 files changed

+18
-29
lines changed

dev/dependencyList

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ jakarta.validation-api/2.0.2//jakarta.validation-api-2.0.2.jar
5353
jakarta.ws.rs-api/2.1.6//jakarta.ws.rs-api-2.1.6.jar
5454
jakarta.xml.bind-api/2.3.2//jakarta.xml.bind-api-2.3.2.jar
5555
javassist/3.25.0-GA//javassist-3.25.0-GA.jar
56-
jaxb-api/2.2.11//jaxb-api-2.2.11.jar
5756
jcl-over-slf4j/1.7.30//jcl-over-slf4j-1.7.30.jar
5857
jersey-client/2.34//jersey-client-2.34.jar
5958
jersey-common/2.34//jersey-common-2.34.jar

dev/kyuubi-extension-spark-3-1/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@
122122
</dependency>
123123

124124
<dependency>
125-
<groupId>javax.xml.bind</groupId>
126-
<artifactId>jaxb-api</artifactId>
125+
<groupId>jakarta.xml.bind</groupId>
126+
<artifactId>jakarta.xml.bind-api</artifactId>
127127
<scope>test</scope>
128128
</dependency>
129129
</dependencies>

dev/kyuubi-extension-spark-3-2/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@
122122
</dependency>
123123

124124
<dependency>
125-
<groupId>javax.xml.bind</groupId>
126-
<artifactId>jaxb-api</artifactId>
125+
<groupId>jakarta.xml.bind</groupId>
126+
<artifactId>jakarta.xml.bind-api</artifactId>
127127
<scope>test</scope>
128128
</dependency>
129129
</dependencies>

dev/kyuubi-extension-spark-common/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@
108108
</dependency>
109109

110110
<dependency>
111-
<groupId>javax.xml.bind</groupId>
112-
<artifactId>jaxb-api</artifactId>
111+
<groupId>jakarta.xml.bind</groupId>
112+
<artifactId>jakarta.xml.bind-api</artifactId>
113113
<scope>test</scope>
114114
</dependency>
115115
</dependencies>

kyuubi-common/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@
9999
</dependency>
100100

101101
<dependency>
102-
<groupId>javax.xml.bind</groupId>
103-
<artifactId>jaxb-api</artifactId>
102+
<groupId>jakarta.xml.bind</groupId>
103+
<artifactId>jakarta.xml.bind-api</artifactId>
104104
</dependency>
105105

106106
<dependency>

kyuubi-server/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,8 @@
356356
</dependency>
357357

358358
<dependency>
359-
<groupId>javax.activation</groupId>
360-
<artifactId>activation</artifactId>
359+
<groupId>jakarta.activation</groupId>
360+
<artifactId>jakarta.activation-api</artifactId>
361361
<scope>test</scope>
362362
</dependency>
363363

pom.xml

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@
116116
<iceberg.version>0.12.1</iceberg.version>
117117
<jackson.version>2.12.5</jackson.version>
118118
<jakarta.servlet-api.version>4.0.4</jakarta.servlet-api.version>
119-
<jaxb.version>2.2.11</jaxb.version>
120-
<javax-activation.version>1.1.1</javax-activation.version>
119+
<jakarta.xml-bind.version>2.3.2</jakarta.xml-bind.version>
120+
<jakarta.activation.version>1.2.1</jakarta.activation.version>
121121
<jersey.version>2.34</jersey.version>
122122
<jetty.version>9.4.41.v20210516</jetty.version>
123123
<jline.version>0.9.94</jline.version>
@@ -705,16 +705,6 @@
705705
<groupId>com.fasterxml.jackson.module</groupId>
706706
<artifactId>jackson-module-jaxb-annotations</artifactId>
707707
<version>${jackson.version}</version>
708-
<exclusions>
709-
<exclusion>
710-
<artifactId>jakarta.xml.bind-api</artifactId>
711-
<groupId>jakarta.xml.bind</groupId>
712-
</exclusion>
713-
<exclusion>
714-
<artifactId>jakarta.activation-api</artifactId>
715-
<groupId>jakarta.activation</groupId>
716-
</exclusion>
717-
</exclusions>
718708
</dependency>
719709

720710
<dependency>
@@ -1019,19 +1009,19 @@
10191009
we need explicitly add this dependency.
10201010
-->
10211011
<dependency>
1022-
<groupId>javax.xml.bind</groupId>
1023-
<artifactId>jaxb-api</artifactId>
1024-
<version>${jaxb.version}</version>
1012+
<groupId>jakarta.xml.bind</groupId>
1013+
<artifactId>jakarta.xml.bind-api</artifactId>
1014+
<version>${jakarta.xml-bind.version}</version>
10251015
</dependency>
10261016

10271017
<!--
10281018
Required for Yarn Mini Cluster on JDK 11, it already be a transitive dependency
10291019
of spark-core, thus only should explicitly add on Kyuubi Server Main test scope.
10301020
-->
10311021
<dependency>
1032-
<groupId>javax.activation</groupId>
1033-
<artifactId>activation</artifactId>
1034-
<version>${javax-activation.version}</version>
1022+
<groupId>jakarta.activation</groupId>
1023+
<artifactId>jakarta.activation-api</artifactId>
1024+
<version>${jakarta.activation.version}</version>
10351025
</dependency>
10361026

10371027
<!-- Zookeeper Cli required -->

0 commit comments

Comments
 (0)