Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 37 additions & 37 deletions dev/dependencyList
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@ httpclient/4.5.14//httpclient-4.5.14.jar
httpcore/4.4.16//httpcore-4.4.16.jar
httpmime/4.5.14//httpmime-4.5.14.jar
j2objc-annotations/2.8//j2objc-annotations-2.8.jar
jackson-annotations/2.15.4//jackson-annotations-2.15.4.jar
jackson-core/2.15.4//jackson-core-2.15.4.jar
jackson-databind/2.15.4//jackson-databind-2.15.4.jar
jackson-dataformat-yaml/2.15.4//jackson-dataformat-yaml-2.15.4.jar
jackson-datatype-jdk8/2.15.4//jackson-datatype-jdk8-2.15.4.jar
jackson-datatype-jsr310/2.15.4//jackson-datatype-jsr310-2.15.4.jar
jackson-jaxrs-base/2.15.4//jackson-jaxrs-base-2.15.4.jar
jackson-jaxrs-json-provider/2.15.4//jackson-jaxrs-json-provider-2.15.4.jar
jackson-module-jaxb-annotations/2.15.4//jackson-module-jaxb-annotations-2.15.4.jar
jackson-module-scala_2.12/2.15.4//jackson-module-scala_2.12-2.15.4.jar
jackson-annotations/2.20//jackson-annotations-2.20.jar
jackson-core/2.20.1//jackson-core-2.20.1.jar
jackson-databind/2.20.1//jackson-databind-2.20.1.jar
jackson-dataformat-yaml/2.20.1//jackson-dataformat-yaml-2.20.1.jar
jackson-datatype-jdk8/2.20.1//jackson-datatype-jdk8-2.20.1.jar
jackson-datatype-jsr310/2.20.1//jackson-datatype-jsr310-2.20.1.jar
jackson-jaxrs-base/2.20.1//jackson-jaxrs-base-2.20.1.jar
jackson-jaxrs-json-provider/2.20.1//jackson-jaxrs-json-provider-2.20.1.jar
jackson-module-jaxb-annotations/2.20.1//jackson-module-jaxb-annotations-2.20.1.jar
jackson-module-scala_2.12/2.20.1//jackson-module-scala_2.12-2.20.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.validation-api/2.0.2//jakarta.validation-api-2.0.2.jar
Expand Down Expand Up @@ -98,31 +98,31 @@ jetty-util/9.4.57.v20241219//jetty-util-9.4.57.v20241219.jar
jline/2.14.6//jline-2.14.6.jar
jul-to-slf4j/1.7.36//jul-to-slf4j-1.7.36.jar
kafka-clients/3.9.1//kafka-clients-3.9.1.jar
kubernetes-client-api/6.13.5//kubernetes-client-api-6.13.5.jar
kubernetes-client/6.13.5//kubernetes-client-6.13.5.jar
kubernetes-httpclient-okhttp/6.13.5//kubernetes-httpclient-okhttp-6.13.5.jar
kubernetes-model-admissionregistration/6.13.5//kubernetes-model-admissionregistration-6.13.5.jar
kubernetes-model-apiextensions/6.13.5//kubernetes-model-apiextensions-6.13.5.jar
kubernetes-model-apps/6.13.5//kubernetes-model-apps-6.13.5.jar
kubernetes-model-autoscaling/6.13.5//kubernetes-model-autoscaling-6.13.5.jar
kubernetes-model-batch/6.13.5//kubernetes-model-batch-6.13.5.jar
kubernetes-model-certificates/6.13.5//kubernetes-model-certificates-6.13.5.jar
kubernetes-model-common/6.13.5//kubernetes-model-common-6.13.5.jar
kubernetes-model-coordination/6.13.5//kubernetes-model-coordination-6.13.5.jar
kubernetes-model-core/6.13.5//kubernetes-model-core-6.13.5.jar
kubernetes-model-discovery/6.13.5//kubernetes-model-discovery-6.13.5.jar
kubernetes-model-events/6.13.5//kubernetes-model-events-6.13.5.jar
kubernetes-model-extensions/6.13.5//kubernetes-model-extensions-6.13.5.jar
kubernetes-model-flowcontrol/6.13.5//kubernetes-model-flowcontrol-6.13.5.jar
kubernetes-model-gatewayapi/6.13.5//kubernetes-model-gatewayapi-6.13.5.jar
kubernetes-model-metrics/6.13.5//kubernetes-model-metrics-6.13.5.jar
kubernetes-model-networking/6.13.5//kubernetes-model-networking-6.13.5.jar
kubernetes-model-node/6.13.5//kubernetes-model-node-6.13.5.jar
kubernetes-model-policy/6.13.5//kubernetes-model-policy-6.13.5.jar
kubernetes-model-rbac/6.13.5//kubernetes-model-rbac-6.13.5.jar
kubernetes-model-resource/6.13.5//kubernetes-model-resource-6.13.5.jar
kubernetes-model-scheduling/6.13.5//kubernetes-model-scheduling-6.13.5.jar
kubernetes-model-storageclass/6.13.5//kubernetes-model-storageclass-6.13.5.jar
kubernetes-client-api/6.14.0//kubernetes-client-api-6.14.0.jar
kubernetes-client/6.14.0//kubernetes-client-6.14.0.jar
kubernetes-httpclient-okhttp/6.14.0//kubernetes-httpclient-okhttp-6.14.0.jar
kubernetes-model-admissionregistration/6.14.0//kubernetes-model-admissionregistration-6.14.0.jar
kubernetes-model-apiextensions/6.14.0//kubernetes-model-apiextensions-6.14.0.jar
kubernetes-model-apps/6.14.0//kubernetes-model-apps-6.14.0.jar
kubernetes-model-autoscaling/6.14.0//kubernetes-model-autoscaling-6.14.0.jar
kubernetes-model-batch/6.14.0//kubernetes-model-batch-6.14.0.jar
kubernetes-model-certificates/6.14.0//kubernetes-model-certificates-6.14.0.jar
kubernetes-model-common/6.14.0//kubernetes-model-common-6.14.0.jar
kubernetes-model-coordination/6.14.0//kubernetes-model-coordination-6.14.0.jar
kubernetes-model-core/6.14.0//kubernetes-model-core-6.14.0.jar
kubernetes-model-discovery/6.14.0//kubernetes-model-discovery-6.14.0.jar
kubernetes-model-events/6.14.0//kubernetes-model-events-6.14.0.jar
kubernetes-model-extensions/6.14.0//kubernetes-model-extensions-6.14.0.jar
kubernetes-model-flowcontrol/6.14.0//kubernetes-model-flowcontrol-6.14.0.jar
kubernetes-model-gatewayapi/6.14.0//kubernetes-model-gatewayapi-6.14.0.jar
kubernetes-model-metrics/6.14.0//kubernetes-model-metrics-6.14.0.jar
kubernetes-model-networking/6.14.0//kubernetes-model-networking-6.14.0.jar
kubernetes-model-node/6.14.0//kubernetes-model-node-6.14.0.jar
kubernetes-model-policy/6.14.0//kubernetes-model-policy-6.14.0.jar
kubernetes-model-rbac/6.14.0//kubernetes-model-rbac-6.14.0.jar
kubernetes-model-resource/6.14.0//kubernetes-model-resource-6.14.0.jar
kubernetes-model-scheduling/6.14.0//kubernetes-model-scheduling-6.14.0.jar
kubernetes-model-storageclass/6.14.0//kubernetes-model-storageclass-6.14.0.jar
log4j-1.2-api/2.24.3//log4j-1.2-api-2.24.3.jar
log4j-api/2.24.3//log4j-api-2.24.3.jar
log4j-core/2.24.3//log4j-core-2.24.3.jar
Expand Down Expand Up @@ -156,7 +156,7 @@ okhttp-urlconnection/3.14.9//okhttp-urlconnection-3.14.9.jar
okhttp/3.12.12//okhttp-3.12.12.jar
okio/1.15.0//okio-1.15.0.jar
osgi-resource-locator/1.0.3//osgi-resource-locator-1.0.3.jar
paranamer/2.8//paranamer-2.8.jar
paranamer/2.8.3//paranamer-2.8.3.jar
perfmark-api/0.26.0//perfmark-api-0.26.0.jar
postgresql/42.7.2//postgresql-42.7.2.jar
proto-google-common-protos/2.29.0//proto-google-common-protos-2.29.0.jar
Expand All @@ -173,7 +173,7 @@ simpleclient_tracer_common/0.16.0//simpleclient_tracer_common-0.16.0.jar
simpleclient_tracer_otel/0.16.0//simpleclient_tracer_otel-0.16.0.jar
simpleclient_tracer_otel_agent/0.16.0//simpleclient_tracer_otel_agent-0.16.0.jar
slf4j-api/1.7.36//slf4j-api-1.7.36.jar
snakeyaml-engine/2.7//snakeyaml-engine-2.7.jar
snakeyaml-engine/2.9//snakeyaml-engine-2.9.jar
snakeyaml/2.2//snakeyaml-2.2.jar
sqlite-jdbc/3.46.1.3//sqlite-jdbc-3.46.1.3.jar
swagger-annotations/2.2.1//swagger-annotations-2.2.1.jar
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import java.time.Duration
import java.util.concurrent.TimeUnit

import com.fasterxml.jackson.annotation.JsonInclude
import com.fasterxml.jackson.databind.{DeserializationFeature, ObjectMapper, PropertyNamingStrategy}
import com.fasterxml.jackson.databind.{DeserializationFeature, ObjectMapper, PropertyNamingStrategies}
import io.reactivex.Single
import okhttp3.{ConnectionPool, OkHttpClient}
import retrofit2.{HttpException, Retrofit}
Expand Down Expand Up @@ -69,7 +69,7 @@ object ErnieBotService {
val mapper: ObjectMapper = new ObjectMapper
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL)
mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
mapper.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE)
mapper
}

Expand Down
6 changes: 6 additions & 0 deletions kyuubi-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,12 @@
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
72 changes: 14 additions & 58 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
<hudi.artifact>hudi-spark${spark.binary.version}-bundle_${scala.binary.version}</hudi.artifact>
<iceberg.version>1.10.0</iceberg.version>
<iceberg.artifact>iceberg-spark-runtime-${spark.binary.version}_${scala.binary.version}</iceberg.artifact>
<jackson.version>2.15.4</jackson.version>
<jackson.version>2.20.1</jackson.version>
<javax.servlet-api.version>4.0.1</javax.servlet-api.version>
<!-- 6.0.0 requires JDK 11 -->
<jakarta.servlet-api.version>5.0.0</jakarta.servlet-api.version>
Expand All @@ -176,7 +176,9 @@
<jline.version>2.14.6</jline.version>
<junit.version>4.13.2</junit.version>
<kafka.version>3.9.1</kafka.version>
<kubernetes-client.version>6.13.5</kubernetes-client.version>
<!-- 6.14.0 requires Jackson 2.19.0+
https://github.com/fabric8io/kubernetes-client/releases/tag/v6.14.0 -->
<kubernetes-client.version>6.14.0</kubernetes-client.version>
<kyuubi-relocated.version>0.6.0</kyuubi-relocated.version>
<kyuubi-relocated-zookeeper.artifacts>kyuubi-relocated-zookeeper-34</kyuubi-relocated-zookeeper.artifacts>
<ldapsdk.version>6.0.5</ldapsdk.version>
Expand Down Expand Up @@ -711,63 +713,11 @@
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-base</artifactId>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
Expand Down Expand Up @@ -819,6 +769,10 @@
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down Expand Up @@ -1935,6 +1889,8 @@
<ignoredScopes>provided</ignoredScopes>
<ignoredScopes>test</ignoredScopes>
<ignoreClasses>
<!-- Only used for JDK9+ -->
<ignoreClass>com.thoughtworks.paranamer.DefaultParanamer</ignoreClass>
<!--
The package `org.jline.terminal.impl.ffm.*` contains some class files
that are not compatible with JDK17 (only JDK21 is supported).
Expand Down
Loading