support v3.x

apache · May 27, 2024 · f39ba94 · f39ba94
1 parent 4d31464
commit f39ba94
Show file tree

Hide file tree

Showing 72 changed files with 146 additions and 8 deletions.
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -28,7 +28,7 @@ include(
   "clients:client-python"
 )
 include("trino-connector")
-include("spark-connector:spark-connector-common", "spark-connector:spark3.3", "spark-connector:spark3.4", "spark-connector:spark3.5", "spark-connector:spark-connector-runtime")
+include("spark-connector:common", "spark-connector:v3.3:spark", "spark-connector:v3.3:spark-runtime", "spark-connector:v3.4:spark", "spark-connector:v3.4:spark-runtime", "spark-connector:v3.5:spark", "spark-connector:v3.5:spark-runtime") 
 include("flink-connector")
 include("web")
 include("docs")

diff --git a/...r/spark-connector-common/build.gradle.kts → spark-connector/common/build.gradle.kts b/...r/spark-connector-common/build.gradle.kts → spark-connector/common/build.gradle.kts
diff --git a/...o/spark/connector/ConnectorConstants.java → ...o/spark/connector/ConnectorConstants.java b/...o/spark/connector/ConnectorConstants.java → ...o/spark/connector/ConnectorConstants.java
diff --git a/...spark/connector/GravitinoSparkConfig.java → ...spark/connector/GravitinoSparkConfig.java b/...spark/connector/GravitinoSparkConfig.java → ...spark/connector/GravitinoSparkConfig.java
diff --git a/.../spark/connector/PropertiesConverter.java → .../spark/connector/PropertiesConverter.java b/.../spark/connector/PropertiesConverter.java → .../spark/connector/PropertiesConverter.java
diff --git a/.../connector/SparkTableChangeConverter.java → .../connector/SparkTableChangeConverter.java b/.../connector/SparkTableChangeConverter.java → .../connector/SparkTableChangeConverter.java
diff --git a/...rk/connector/SparkTransformConverter.java → ...rk/connector/SparkTransformConverter.java b/...rk/connector/SparkTransformConverter.java → ...rk/connector/SparkTransformConverter.java
diff --git a/...o/spark/connector/SparkTypeConverter.java → ...o/spark/connector/SparkTypeConverter.java b/...o/spark/connector/SparkTypeConverter.java → ...o/spark/connector/SparkTypeConverter.java
diff --git a/.../spark/connector/catalog/BaseCatalog.java → .../spark/connector/catalog/BaseCatalog.java b/.../spark/connector/catalog/BaseCatalog.java → .../spark/connector/catalog/BaseCatalog.java
diff --git a/...ctor/catalog/GravitinoCatalogManager.java → ...ctor/catalog/GravitinoCatalogManager.java b/...ctor/catalog/GravitinoCatalogManager.java → ...ctor/catalog/GravitinoCatalogManager.java
diff --git a/.../connector/hive/GravitinoHiveCatalog.java → .../connector/hive/GravitinoHiveCatalog.java b/.../connector/hive/GravitinoHiveCatalog.java → .../connector/hive/GravitinoHiveCatalog.java
diff --git a/...nnector/hive/HivePropertiesConstants.java → ...nnector/hive/HivePropertiesConstants.java b/...nnector/hive/HivePropertiesConstants.java → ...nnector/hive/HivePropertiesConstants.java
diff --git a/...nnector/hive/HivePropertiesConverter.java → ...nnector/hive/HivePropertiesConverter.java b/...nnector/hive/HivePropertiesConverter.java → ...nnector/hive/HivePropertiesConverter.java
diff --git a/.../spark/connector/hive/SparkHiveTable.java → .../spark/connector/hive/SparkHiveTable.java b/.../spark/connector/hive/SparkHiveTable.java → .../spark/connector/hive/SparkHiveTable.java
diff --git a/...ctor/iceberg/GravitinoIcebergCatalog.java → ...ctor/iceberg/GravitinoIcebergCatalog.java b/...ctor/iceberg/GravitinoIcebergCatalog.java → ...ctor/iceberg/GravitinoIcebergCatalog.java
diff --git a/...r/iceberg/IcebergPropertiesConstants.java → ...r/iceberg/IcebergPropertiesConstants.java b/...r/iceberg/IcebergPropertiesConstants.java → ...r/iceberg/IcebergPropertiesConstants.java
diff --git a/...r/iceberg/IcebergPropertiesConverter.java → ...r/iceberg/IcebergPropertiesConverter.java b/...r/iceberg/IcebergPropertiesConverter.java → ...r/iceberg/IcebergPropertiesConverter.java
diff --git a/.../connector/iceberg/SparkIcebergTable.java → .../connector/iceberg/SparkIcebergTable.java b/.../connector/iceberg/SparkIcebergTable.java → .../connector/iceberg/SparkIcebergTable.java
diff --git a/...nnector/plugin/GravitinoDriverPlugin.java → ...nnector/plugin/GravitinoDriverPlugin.java b/...nnector/plugin/GravitinoDriverPlugin.java → ...nnector/plugin/GravitinoDriverPlugin.java
diff --git a/...onnector/plugin/GravitinoSparkPlugin.java → ...onnector/plugin/GravitinoSparkPlugin.java b/...onnector/plugin/GravitinoSparkPlugin.java → ...onnector/plugin/GravitinoSparkPlugin.java
diff --git a/.../spark/connector/utils/ConnectorUtil.java → .../spark/connector/utils/ConnectorUtil.java b/.../spark/connector/utils/ConnectorUtil.java → .../spark/connector/utils/ConnectorUtil.java
diff --git a/...ector/utils/GravitinoTableInfoHelper.java → ...ector/utils/GravitinoTableInfoHelper.java b/...ector/utils/GravitinoTableInfoHelper.java → ...ector/utils/GravitinoTableInfoHelper.java
diff --git a/...connector/version/CatalogNameAdaptor.java → ...connector/version/CatalogNameAdaptor.java b/...connector/version/CatalogNameAdaptor.java → ...connector/version/CatalogNameAdaptor.java
diff --git a/...onnector/TestSparkTransformConverter.java → ...onnector/TestSparkTransformConverter.java b/...onnector/TestSparkTransformConverter.java → ...onnector/TestSparkTransformConverter.java
diff --git a/...ark/connector/TestSparkTypeConverter.java → ...ark/connector/TestSparkTypeConverter.java b/...ark/connector/TestSparkTypeConverter.java → ...ark/connector/TestSparkTypeConverter.java
diff --git a/...tor/catalog/TestTransformTableChange.java → ...tor/catalog/TestTransformTableChange.java b/...tor/catalog/TestTransformTableChange.java → ...tor/catalog/TestTransformTableChange.java
diff --git a/...tor/hive/TestHivePropertiesConverter.java → ...tor/hive/TestHivePropertiesConverter.java b/...tor/hive/TestHivePropertiesConverter.java → ...tor/hive/TestHivePropertiesConverter.java
diff --git a/...eberg/TestIcebergPropertiesConverter.java → ...eberg/TestIcebergPropertiesConverter.java b/...eberg/TestIcebergPropertiesConverter.java → ...eberg/TestIcebergPropertiesConverter.java
diff --git a/...ector/integration/test/SparkCommonIT.java → ...ector/integration/test/SparkCommonIT.java b/...ector/integration/test/SparkCommonIT.java → ...ector/integration/test/SparkCommonIT.java
diff --git a/...onnector/integration/test/SparkEnvIT.java → ...onnector/integration/test/SparkEnvIT.java b/...onnector/integration/test/SparkEnvIT.java → ...onnector/integration/test/SparkEnvIT.java
diff --git a/...gration/test/hive/SparkHiveCatalogIT.java → ...gration/test/hive/SparkHiveCatalogIT.java b/...gration/test/hive/SparkHiveCatalogIT.java → ...gration/test/hive/SparkHiveCatalogIT.java
diff --git a/...erg/SparkIcebergCatalogHiveBackendIT.java → ...erg/SparkIcebergCatalogHiveBackendIT.java b/...erg/SparkIcebergCatalogHiveBackendIT.java → ...erg/SparkIcebergCatalogHiveBackendIT.java
diff --git a/...n/test/iceberg/SparkIcebergCatalogIT.java → ...n/test/iceberg/SparkIcebergCatalogIT.java b/...n/test/iceberg/SparkIcebergCatalogIT.java → ...n/test/iceberg/SparkIcebergCatalogIT.java
diff --git a/...erg/SparkIcebergCatalogRestBackendIT.java → ...erg/SparkIcebergCatalogRestBackendIT.java b/...erg/SparkIcebergCatalogRestBackendIT.java → ...erg/SparkIcebergCatalogRestBackendIT.java
diff --git a/...on/test/util/SparkMetadataColumnInfo.java → ...on/test/util/SparkMetadataColumnInfo.java b/...on/test/util/SparkMetadataColumnInfo.java → ...on/test/util/SparkMetadataColumnInfo.java
diff --git a/...integration/test/util/SparkTableInfo.java → ...integration/test/util/SparkTableInfo.java b/...integration/test/util/SparkTableInfo.java → ...integration/test/util/SparkTableInfo.java
diff --git a/...tion/test/util/SparkTableInfoChecker.java → ...tion/test/util/SparkTableInfoChecker.java b/...tion/test/util/SparkTableInfoChecker.java → ...tion/test/util/SparkTableInfoChecker.java
diff --git a/...or/integration/test/util/SparkUtilIT.java → ...or/integration/test/util/SparkUtilIT.java b/...or/integration/test/util/SparkUtilIT.java → ...or/integration/test/util/SparkUtilIT.java
diff --git a/...tor/plugin/TestGravitinoDriverPlugin.java → ...tor/plugin/TestGravitinoDriverPlugin.java b/...tor/plugin/TestGravitinoDriverPlugin.java → ...tor/plugin/TestGravitinoDriverPlugin.java
diff --git a/...rk/connector/utils/TestConnectorUtil.java → ...rk/connector/utils/TestConnectorUtil.java b/...rk/connector/utils/TestConnectorUtil.java → ...rk/connector/utils/TestConnectorUtil.java
diff --git a/...mmon/src/test/resources/log4j2.properties → ...mmon/src/test/resources/log4j2.properties b/...mmon/src/test/resources/log4j2.properties → ...mmon/src/test/resources/log4j2.properties
diff --git a/spark-connector/v3.3/spark-runtime/build.gradle.kts b/spark-connector/v3.3/spark-runtime/build.gradle.kts
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2024 Datastrato Pvt Ltd.
+ * This software is licensed under the Apache License version 2.
+ */
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+plugins {
+  `maven-publish`
+  id("java")
+  alias(libs.plugins.shadow)
+}
+
+val scalaVersion: String = project.properties["scalaVersion"] as? String ?: extra["defaultScalaVersion"].toString()
+val sparkVersion: String = libs.versions.spark33.get()
+val sparkMajorVersion: String = sparkVersion.substringBeforeLast(".")
+val baseName = "${rootProject.name}-spark-connector-runtime-${sparkMajorVersion}_$scalaVersion"
+
+dependencies {
+  implementation(project(":clients:client-java-runtime", configuration = "shadow"))
+  when (sparkMajorVersion) {
+    "3.3" -> {
+      val kyuubiVersion: String = libs.versions.kyuubi4spark33.get()
+      println("Applying Spark 3.3 dependencies")
+      implementation(project(":spark-connector:v3.3:spark"))
+      implementation("org.apache.kyuubi:kyuubi-spark-connector-hive_$scalaVersion:$kyuubiVersion")
+    }
+    else -> throw IllegalArgumentException("Unsupported Spark version: $sparkMajorVersion")
+  }
+}
+
+tasks.withType<ShadowJar>(ShadowJar::class.java) {
+  isZip64 = true
+  configurations = listOf(project.configurations.runtimeClasspath.get())
+  archiveFileName.set("$baseName-$version.jar")
+  archiveClassifier.set("")
+
+  // Relocate dependencies to avoid conflicts
+  relocate("com.google", "com.datastrato.gravitino.shaded.com.google")
+  relocate("google", "com.datastrato.gravitino.shaded.google")
+  relocate("org.apache.hc", "com.datastrato.gravitino.shaded.org.apache.hc")
+}
+
+tasks.jar {
+  dependsOn(tasks.named("shadowJar"))
+  archiveClassifier.set("empty")
+}
diff --git a/spark-connector/spark3.3/build.gradle.kts → spark-connector/v3.3/spark/build.gradle.kts b/spark-connector/spark3.3/build.gradle.kts → spark-connector/v3.3/spark/build.gradle.kts
@@ -22,7 +22,7 @@ val scalaJava8CompatVersion: String = libs.versions.scala.java.compat.get()
 val scalaCollectionCompatVersion: String = libs.versions.scala.collection.compat.get()
 
 dependencies {
-  implementation(project(":spark-connector:spark-connector-common"))
+  implementation(project(":spark-connector:common"))
   compileOnly("org.apache.kyuubi:kyuubi-spark-connector-hive_$scalaVersion:$kyuubiVersion")
   compileOnly("org.apache.spark:spark-catalyst_$scalaVersion:$sparkVersion") {
     exclude("com.fasterxml.jackson")
@@ -48,7 +48,7 @@ dependencies {
   testImplementation(project(":server-common")) {
     exclude("org.apache.logging.log4j")
   }
-  testImplementation(project(":spark-connector:spark-connector-common", "testArtifacts")) {
+  testImplementation(project(":spark-connector:common", "testArtifacts")) {
     exclude("com.fasterxml.jackson")
   }
 

diff --git a/...tor/hive/GravitinoHiveCatalogSpark33.java → ...tor/hive/GravitinoHiveCatalogSpark33.java b/...tor/hive/GravitinoHiveCatalogSpark33.java → ...tor/hive/GravitinoHiveCatalogSpark33.java
diff --git a/...eberg/GravitinoIcebergCatalogSpark33.java → ...eberg/GravitinoIcebergCatalogSpark33.java b/...eberg/GravitinoIcebergCatalogSpark33.java → ...eberg/GravitinoIcebergCatalogSpark33.java
diff --git a/...ation/test/hive/SparkHiveCatalogIT33.java → ...ation/test/hive/SparkHiveCatalogIT33.java b/...ation/test/hive/SparkHiveCatalogIT33.java → ...ation/test/hive/SparkHiveCatalogIT33.java
diff --git a/...g/SparkIcebergCatalogHiveBackendIT33.java → ...g/SparkIcebergCatalogHiveBackendIT33.java b/...g/SparkIcebergCatalogHiveBackendIT33.java → ...g/SparkIcebergCatalogHiveBackendIT33.java
diff --git a/...g/SparkIcebergCatalogRestBackendIT33.java → ...g/SparkIcebergCatalogRestBackendIT33.java b/...g/SparkIcebergCatalogRestBackendIT33.java → ...g/SparkIcebergCatalogRestBackendIT33.java
diff --git a/...ector/version/TestCatalogNameAdaptor.java → ...ector/version/TestCatalogNameAdaptor.java b/...ector/version/TestCatalogNameAdaptor.java → ...ector/version/TestCatalogNameAdaptor.java
diff --git a/...k3.3/src/test/resources/log4j2.properties → ...park/src/test/resources/log4j2.properties b/...k3.3/src/test/resources/log4j2.properties → ...park/src/test/resources/log4j2.properties
diff --git a/spark-connector/v3.4/spark-runtime/build.gradle.kts b/spark-connector/v3.4/spark-runtime/build.gradle.kts
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2024 Datastrato Pvt Ltd.
+ * This software is licensed under the Apache License version 2.
+ */
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+plugins {
+  `maven-publish`
+  id("java")
+  alias(libs.plugins.shadow)
+}
+
+val scalaVersion: String = project.properties["scalaVersion"] as? String ?: extra["defaultScalaVersion"].toString()
+val sparkVersion: String = libs.versions.spark34.get()
+val sparkMajorVersion: String = sparkVersion.substringBeforeLast(".")
+val baseName = "${rootProject.name}-spark-connector-runtime-${sparkMajorVersion}_$scalaVersion"
+
+dependencies {
+  implementation(project(":clients:client-java-runtime", configuration = "shadow"))
+  when (sparkMajorVersion) {
+    "3.4" -> {
+      val kyuubiVersion: String = libs.versions.kyuubi4spark34.get()
+      println("Applying Spark 3.4 dependencies")
+      implementation(project(":spark-connector:v3.4:spark"))
+      implementation("org.apache.kyuubi:kyuubi-spark-connector-hive_$scalaVersion:$kyuubiVersion")
+    }
+    else -> throw IllegalArgumentException("Unsupported Spark version: $sparkMajorVersion")
+  }
+}
+
+tasks.withType<ShadowJar>(ShadowJar::class.java) {
+  isZip64 = true
+  configurations = listOf(project.configurations.runtimeClasspath.get())
+  archiveFileName.set("$baseName-$version.jar")
+  archiveClassifier.set("")
+
+  // Relocate dependencies to avoid conflicts
+  relocate("com.google", "com.datastrato.gravitino.shaded.com.google")
+  relocate("google", "com.datastrato.gravitino.shaded.google")
+  relocate("org.apache.hc", "com.datastrato.gravitino.shaded.org.apache.hc")
+}
+
+tasks.jar {
+  dependsOn(tasks.named("shadowJar"))
+  archiveClassifier.set("empty")
+}
diff --git a/spark-connector/spark3.4/build.gradle.kts → spark-connector/v3.4/spark/build.gradle.kts b/spark-connector/spark3.4/build.gradle.kts → spark-connector/v3.4/spark/build.gradle.kts
@@ -22,7 +22,7 @@ val scalaJava8CompatVersion: String = libs.versions.scala.java.compat.get()
 val scalaCollectionCompatVersion: String = libs.versions.scala.collection.compat.get()
 
 dependencies {
-  implementation(project(":spark-connector:spark-connector-common"))
+  implementation(project(":spark-connector:common"))
   compileOnly("org.apache.kyuubi:kyuubi-spark-connector-hive_$scalaVersion:$kyuubiVersion")
   compileOnly("org.apache.spark:spark-catalyst_$scalaVersion:$sparkVersion") {
     exclude("com.fasterxml.jackson")
@@ -49,7 +49,7 @@ dependencies {
   testImplementation(project(":server-common")) {
     exclude("org.apache.logging.log4j")
   }
-  testImplementation(project(":spark-connector:spark-connector-common", "testArtifacts")) {
+  testImplementation(project(":spark-connector:common", "testArtifacts")) {
     exclude("com.fasterxml.jackson")
   }
 

diff --git a/...onnector/SparkTableChangeConverter34.java → ...onnector/SparkTableChangeConverter34.java b/...onnector/SparkTableChangeConverter34.java → ...onnector/SparkTableChangeConverter34.java
diff --git a/...spark/connector/SparkTypeConverter34.java → ...spark/connector/SparkTypeConverter34.java b/...spark/connector/SparkTypeConverter34.java → ...spark/connector/SparkTypeConverter34.java
diff --git a/...tor/hive/GravitinoHiveCatalogSpark34.java → ...tor/hive/GravitinoHiveCatalogSpark34.java b/...tor/hive/GravitinoHiveCatalogSpark34.java → ...tor/hive/GravitinoHiveCatalogSpark34.java
diff --git a/...eberg/GravitinoIcebergCatalogSpark34.java → ...eberg/GravitinoIcebergCatalogSpark34.java b/...eberg/GravitinoIcebergCatalogSpark34.java → ...eberg/GravitinoIcebergCatalogSpark34.java
diff --git a/...ctor/TestSparkTableChangeConverter34.java → ...ctor/TestSparkTableChangeConverter34.java b/...ctor/TestSparkTableChangeConverter34.java → ...ctor/TestSparkTableChangeConverter34.java
diff --git a/...k/connector/TestSparkTypeConverter34.java → ...k/connector/TestSparkTypeConverter34.java b/...k/connector/TestSparkTypeConverter34.java → ...k/connector/TestSparkTypeConverter34.java
diff --git a/...ation/test/hive/SparkHiveCatalogIT34.java → ...ation/test/hive/SparkHiveCatalogIT34.java b/...ation/test/hive/SparkHiveCatalogIT34.java → ...ation/test/hive/SparkHiveCatalogIT34.java
diff --git a/...g/SparkIcebergCatalogHiveBackendIT34.java → ...g/SparkIcebergCatalogHiveBackendIT34.java b/...g/SparkIcebergCatalogHiveBackendIT34.java → ...g/SparkIcebergCatalogHiveBackendIT34.java
diff --git a/...g/SparkIcebergCatalogRestBackendIT34.java → ...g/SparkIcebergCatalogRestBackendIT34.java b/...g/SparkIcebergCatalogRestBackendIT34.java → ...g/SparkIcebergCatalogRestBackendIT34.java
diff --git a/...ector/version/TestCatalogNameAdaptor.java → ...ector/version/TestCatalogNameAdaptor.java b/...ector/version/TestCatalogNameAdaptor.java → ...ector/version/TestCatalogNameAdaptor.java
diff --git a/...k3.4/src/test/resources/log4j2.properties → ...park/src/test/resources/log4j2.properties b/...k3.4/src/test/resources/log4j2.properties → ...park/src/test/resources/log4j2.properties
diff --git a/spark-connector/v3.5/spark-runtime/build.gradle.kts b/spark-connector/v3.5/spark-runtime/build.gradle.kts
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2024 Datastrato Pvt Ltd.
+ * This software is licensed under the Apache License version 2.
+ */
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+plugins {
+  `maven-publish`
+  id("java")
+  alias(libs.plugins.shadow)
+}
+
+val scalaVersion: String = project.properties["scalaVersion"] as? String ?: extra["defaultScalaVersion"].toString()
+val sparkVersion: String = libs.versions.spark35.get()
+val sparkMajorVersion: String = sparkVersion.substringBeforeLast(".")
+val baseName = "${rootProject.name}-spark-connector-runtime-${sparkMajorVersion}_$scalaVersion"
+
+dependencies {
+  implementation(project(":clients:client-java-runtime", configuration = "shadow"))
+  when (sparkMajorVersion) {
+    "3.5" -> {
+      val kyuubiVersion: String = libs.versions.kyuubi4spark35.get()
+      println("Applying Spark 3.5 dependencies")
+      implementation(project(":spark-connector:v3.5:spark"))
+      implementation("org.apache.kyuubi:kyuubi-spark-connector-hive_$scalaVersion:$kyuubiVersion")
+    }
+    else -> throw IllegalArgumentException("Unsupported Spark version: $sparkMajorVersion")
+  }
+}
+
+tasks.withType<ShadowJar>(ShadowJar::class.java) {
+  isZip64 = true
+  configurations = listOf(project.configurations.runtimeClasspath.get())
+  archiveFileName.set("$baseName-$version.jar")
+  archiveClassifier.set("")
+
+  // Relocate dependencies to avoid conflicts
+  relocate("com.google", "com.datastrato.gravitino.shaded.com.google")
+  relocate("google", "com.datastrato.gravitino.shaded.google")
+  relocate("org.apache.hc", "com.datastrato.gravitino.shaded.org.apache.hc")
+}
+
+tasks.jar {
+  dependsOn(tasks.named("shadowJar"))
+  archiveClassifier.set("empty")
+}
diff --git a/spark-connector/spark3.5/build.gradle.kts → spark-connector/v3.5/spark/build.gradle.kts b/spark-connector/spark3.5/build.gradle.kts → spark-connector/v3.5/spark/build.gradle.kts
@@ -22,8 +22,8 @@ val scalaJava8CompatVersion: String = libs.versions.scala.java.compat.get()
 val scalaCollectionCompatVersion: String = libs.versions.scala.collection.compat.get()
 
 dependencies {
-  implementation(project(":spark-connector:spark3.4"))
-  implementation(project(":spark-connector:spark-connector-common"))
+  implementation(project(":spark-connector:v3.4:spark"))
+  implementation(project(":spark-connector:common"))
   compileOnly("org.apache.kyuubi:kyuubi-spark-connector-hive_$scalaVersion:$kyuubiVersion")
   compileOnly("org.apache.spark:spark-catalyst_$scalaVersion:$sparkVersion") {
     exclude("com.fasterxml.jackson")
@@ -50,7 +50,7 @@ dependencies {
   testImplementation(project(":server-common")) {
     exclude("org.apache.logging.log4j")
   }
-  testImplementation(project(":spark-connector:spark-connector-common", "testArtifacts")) {
+  testImplementation(project(":spark-connector:common", "testArtifacts")) {
     exclude("com.fasterxml.jackson")
   }
 

diff --git a/...tor/hive/GravitinoHiveCatalogSpark35.java → ...tor/hive/GravitinoHiveCatalogSpark35.java b/...tor/hive/GravitinoHiveCatalogSpark35.java → ...tor/hive/GravitinoHiveCatalogSpark35.java
diff --git a/...eberg/GravitinoIcebergCatalogSpark35.java → ...eberg/GravitinoIcebergCatalogSpark35.java b/...eberg/GravitinoIcebergCatalogSpark35.java → ...eberg/GravitinoIcebergCatalogSpark35.java
diff --git a/...ation/test/hive/SparkHiveCatalogIT35.java → ...ation/test/hive/SparkHiveCatalogIT35.java b/...ation/test/hive/SparkHiveCatalogIT35.java → ...ation/test/hive/SparkHiveCatalogIT35.java
diff --git a/...g/SparkIcebergCatalogHiveBackendIT35.java → ...g/SparkIcebergCatalogHiveBackendIT35.java b/...g/SparkIcebergCatalogHiveBackendIT35.java → ...g/SparkIcebergCatalogHiveBackendIT35.java
diff --git a/...g/SparkIcebergCatalogRestBackendIT35.java → ...g/SparkIcebergCatalogRestBackendIT35.java b/...g/SparkIcebergCatalogRestBackendIT35.java → ...g/SparkIcebergCatalogRestBackendIT35.java
diff --git a/...ector/version/TestCatalogNameAdaptor.java → ...ector/version/TestCatalogNameAdaptor.java b/...ector/version/TestCatalogNameAdaptor.java → ...ector/version/TestCatalogNameAdaptor.java
diff --git a/...k3.5/src/test/resources/log4j2.properties → ...park/src/test/resources/log4j2.properties b/...k3.5/src/test/resources/log4j2.properties → ...park/src/test/resources/log4j2.properties