Skip to content

Commit d1de9ca

Browse files
yaooqinnulysses-you
authored andcommitted
[KYUUBI #1658] Revamp swagger ui dependencies
<!-- Thanks for sending a pull request! Here are some tips for you: 1. If this is your first time, please read our contributor guidelines: https://kyuubi.readthedocs.io/en/latest/community/contributions.html 2. If the PR is related to an issue in https://github.com/apache/incubator-kyuubi/issues, add '[KYUUBI #XXXX]' in your PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'. 3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][KYUUBI #XXXX] Your PR title ...'. --> ### _Why are the changes needed?_ <!-- Please clarify why the changes are needed. For instance, 1. If you add a feature, you can talk about the use case of it. 2. If you fix a bug, you can clarify why it is a bug. --> This PR mainly removes the swagger-scala-module which is currently fine to remove. It also introduces transitive deps with `-jakarta` which could introduce jar conflicts like , ```scala Caused by: java.lang.NoClassDefFoundError: jakarta/xml/bind/annotation/XmlElement at io.swagger.v3.core.jackson.SwaggerAnnotationIntrospector.hasRequiredMarker(SwaggerAnnotationIntrospector.java:29) at com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair.hasRequiredMarker(AnnotationIntrospectorPair.java:319) at com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair.hasRequiredMarker(AnnotationIntrospectorPair.java:319) at com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair.hasRequiredMarker(AnnotationIntrospectorPair.java:319) at com.fasterxml.jackson.databind.introspect.POJOPropertyBuilder.getMetadata(POJOPropertyBuilder.java:229) ``` ### _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 #1658 from yaooqinn/dep. Closes #1658 d5ab076 [Kent Yao] Merge branch 'master' into dep d1ddd5f [Kent Yao] Revamp swagger ui dependencies ecfcc92 [Kent Yao] Revamp swagger ui dependencies 59196b9 [Kent Yao] Revamp swagger ui dependencies d7ca6a5 [Kent Yao] Revamp swagger ui dependencies 215b1b5 [Kent Yao] Revamp swagger ui dependencies Authored-by: Kent Yao <yao@apache.org> Signed-off-by: ulysses-you <ulyssesyou@apache.org>
1 parent 6a95509 commit d1de9ca

File tree

5 files changed

+6
-22
lines changed

5 files changed

+6
-22
lines changed

LICENSE-binary

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-yaml
236236
com.fasterxml.jackson.datatype:jackson-datatype-jsr310
237237
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base
238238
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider
239-
com.github.swagger-akka-http:swagger-scala-module_*
240239
org.eclipse.jetty:jetty-http
241240
org.eclipse.jetty:jetty-io
242241
org.eclipse.jetty:jetty-security
@@ -259,13 +258,10 @@ io.prometheus:simpleclient_common
259258
io.prometheus:simpleclient_dropwizard
260259
io.prometheus:simpleclient_servlet
261260
io.swagger.core.v3:swagger-annotations
262-
io.swagger.core.v3:swagger-annotations-jakarta
263261
io.swagger.core.v3:swagger-core
264-
io.swagger.core.v3:swagger-core-jakarta
265262
io.swagger.core.v3:swagger-integration
266263
io.swagger.core.v3:swagger-jaxrs2
267264
io.swagger.core.v3:swagger-models
268-
io.swagger.core.v3:swagger-models-jakarta
269265
org.apache.zookeeper:zookeeper
270266

271267
BSD
@@ -278,7 +274,6 @@ org.scala-lang:scala-library
278274

279275
Eclipse Distribution License - v 1.0
280276
------------------------------------
281-
com.sun.activation:jakarta.activation
282277
jakarta.xml.bind:jakarta.xml.bind-api
283278

284279
Eclipse Public License (EPL) 2.0

build/dependency.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ DEP="${PWD}"/dev/dependencyList
3232

3333

3434
function build_classpath() {
35-
$MVN dependency:build-classpath -pl :kyuubi-assembly_2.12 |\
35+
$MVN dependency:build-classpath -pl :kyuubi-ctl_2.12,:kyuubi-server_2.12,:kyuubi-assembly_2.12 |\
3636
grep -v "INFO\|WARN" | \
37+
tail -1 | \
3738
tr ":" "\n" | \
3839
awk -F '/' '{
3940
artifact_id=$(NF-2);

dev/dependencyList

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,10 @@ simpleclient_servlet/0.10.0//simpleclient_servlet-0.10.0.jar
9090
slf4j-api/1.7.30//slf4j-api-1.7.30.jar
9191
slf4j-log4j12/1.7.30//slf4j-log4j12-1.7.30.jar
9292
snakeyaml/1.27//snakeyaml-1.27.jar
93-
swagger-annotations-jakarta/2.1.11//swagger-annotations-jakarta-2.1.11.jar
9493
swagger-annotations/2.1.11//swagger-annotations-2.1.11.jar
95-
swagger-core-jakarta/2.1.11//swagger-core-jakarta-2.1.11.jar
9694
swagger-core/2.1.11//swagger-core-2.1.11.jar
9795
swagger-integration/2.1.11//swagger-integration-2.1.11.jar
9896
swagger-jaxrs2/2.1.11//swagger-jaxrs2-2.1.11.jar
99-
swagger-models-jakarta/2.1.11//swagger-models-jakarta-2.1.11.jar
10097
swagger-models/2.1.11//swagger-models-2.1.11.jar
101-
swagger-scala-module_2.12/2.5.2//swagger-scala-module_2.12-2.5.2.jar
10298
swagger-ui/4.1.3//swagger-ui-4.1.3.jar
10399
zookeeper/3.4.14//zookeeper-3.4.14.jar

kyuubi-server/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@
208208
</dependency>
209209

210210
<dependency>
211-
<groupId>com.github.swagger-akka-http</groupId>
212-
<artifactId>swagger-scala-module_${scala.binary.version}</artifactId>
211+
<groupId>jakarta.servlet</groupId>
212+
<artifactId>jakarta.servlet-api</artifactId>
213213
</dependency>
214214

215215
<dependency>

pom.xml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@
134134
<spark.archive.mirror>https://archive.apache.org/dist/spark/spark-${spark.version}</spark.archive.mirror>
135135
<spark.archive.download.skip>false</spark.archive.download.skip>
136136
<swagger.version>2.1.11</swagger.version>
137-
<swagger.scala.module.version>2.5.2</swagger.scala.module.version>
138137
<swagger-ui.version>4.1.3</swagger-ui.version>
139138
<trino.client.version>363</trino.client.version>
140139
<zookeeper.version>3.4.14</zookeeper.version>
@@ -670,17 +669,10 @@
670669
<groupId>io.swagger.core.v3</groupId>
671670
<artifactId>swagger-jaxrs2</artifactId>
672671
<version>${swagger.version}</version>
673-
</dependency>
674-
675-
<!-- ref: https://github.com/swagger-akka-http/swagger-scala-module -->
676-
<dependency>
677-
<groupId>com.github.swagger-akka-http</groupId>
678-
<artifactId>swagger-scala-module_${scala.binary.version}</artifactId>
679-
<version>${swagger.scala.module.version}</version>
680672
<exclusions>
681673
<exclusion>
682-
<artifactId>jakarta.xml.bind-api</artifactId>
683-
<groupId>jakarta.xml.bind</groupId>
674+
<groupId>com.sun.activation</groupId>
675+
<artifactId>jakarta.activation</artifactId>
684676
</exclusion>
685677
</exclusions>
686678
</dependency>

0 commit comments

Comments
 (0)