Skip to content

Commit

Permalink
[KYUUBI #1658] Revamp swagger ui dependencies
Browse files Browse the repository at this point in the history
<!--
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>
  • Loading branch information
yaooqinn authored and ulysses-you committed Dec 31, 2021
1 parent 6a95509 commit d1de9ca
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 22 deletions.
5 changes: 0 additions & 5 deletions LICENSE-binary
Expand Up @@ -236,7 +236,6 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-yaml
com.fasterxml.jackson.datatype:jackson-datatype-jsr310
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider
com.github.swagger-akka-http:swagger-scala-module_*
org.eclipse.jetty:jetty-http
org.eclipse.jetty:jetty-io
org.eclipse.jetty:jetty-security
Expand All @@ -259,13 +258,10 @@ io.prometheus:simpleclient_common
io.prometheus:simpleclient_dropwizard
io.prometheus:simpleclient_servlet
io.swagger.core.v3:swagger-annotations
io.swagger.core.v3:swagger-annotations-jakarta
io.swagger.core.v3:swagger-core
io.swagger.core.v3:swagger-core-jakarta
io.swagger.core.v3:swagger-integration
io.swagger.core.v3:swagger-jaxrs2
io.swagger.core.v3:swagger-models
io.swagger.core.v3:swagger-models-jakarta
org.apache.zookeeper:zookeeper

BSD
Expand All @@ -278,7 +274,6 @@ org.scala-lang:scala-library

Eclipse Distribution License - v 1.0
------------------------------------
com.sun.activation:jakarta.activation
jakarta.xml.bind:jakarta.xml.bind-api

Eclipse Public License (EPL) 2.0
Expand Down
3 changes: 2 additions & 1 deletion build/dependency.sh
Expand Up @@ -32,8 +32,9 @@ DEP="${PWD}"/dev/dependencyList


function build_classpath() {
$MVN dependency:build-classpath -pl :kyuubi-assembly_2.12 |\
$MVN dependency:build-classpath -pl :kyuubi-ctl_2.12,:kyuubi-server_2.12,:kyuubi-assembly_2.12 |\
grep -v "INFO\|WARN" | \
tail -1 | \
tr ":" "\n" | \
awk -F '/' '{
artifact_id=$(NF-2);
Expand Down
4 changes: 0 additions & 4 deletions dev/dependencyList
Expand Up @@ -90,14 +90,10 @@ simpleclient_servlet/0.10.0//simpleclient_servlet-0.10.0.jar
slf4j-api/1.7.30//slf4j-api-1.7.30.jar
slf4j-log4j12/1.7.30//slf4j-log4j12-1.7.30.jar
snakeyaml/1.27//snakeyaml-1.27.jar
swagger-annotations-jakarta/2.1.11//swagger-annotations-jakarta-2.1.11.jar
swagger-annotations/2.1.11//swagger-annotations-2.1.11.jar
swagger-core-jakarta/2.1.11//swagger-core-jakarta-2.1.11.jar
swagger-core/2.1.11//swagger-core-2.1.11.jar
swagger-integration/2.1.11//swagger-integration-2.1.11.jar
swagger-jaxrs2/2.1.11//swagger-jaxrs2-2.1.11.jar
swagger-models-jakarta/2.1.11//swagger-models-jakarta-2.1.11.jar
swagger-models/2.1.11//swagger-models-2.1.11.jar
swagger-scala-module_2.12/2.5.2//swagger-scala-module_2.12-2.5.2.jar
swagger-ui/4.1.3//swagger-ui-4.1.3.jar
zookeeper/3.4.14//zookeeper-3.4.14.jar
4 changes: 2 additions & 2 deletions kyuubi-server/pom.xml
Expand Up @@ -208,8 +208,8 @@
</dependency>

<dependency>
<groupId>com.github.swagger-akka-http</groupId>
<artifactId>swagger-scala-module_${scala.binary.version}</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</dependency>

<dependency>
Expand Down
12 changes: 2 additions & 10 deletions pom.xml
Expand Up @@ -134,7 +134,6 @@
<spark.archive.mirror>https://archive.apache.org/dist/spark/spark-${spark.version}</spark.archive.mirror>
<spark.archive.download.skip>false</spark.archive.download.skip>
<swagger.version>2.1.11</swagger.version>
<swagger.scala.module.version>2.5.2</swagger.scala.module.version>
<swagger-ui.version>4.1.3</swagger-ui.version>
<trino.client.version>363</trino.client.version>
<zookeeper.version>3.4.14</zookeeper.version>
Expand Down Expand Up @@ -670,17 +669,10 @@
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2</artifactId>
<version>${swagger.version}</version>
</dependency>

<!-- ref: https://github.com/swagger-akka-http/swagger-scala-module -->
<dependency>
<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>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down

0 comments on commit d1de9ca

Please sign in to comment.