find class h2 driver

apache · Sep 23, 2024 · 75ca44b · 75ca44b
1 parent df12196
commit 75ca44b
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 9 deletions.
diff --git a/authorizations/authorization-ranger/build.gradle.kts b/authorizations/authorization-ranger/build.gradle.kts
@@ -68,7 +68,6 @@ dependencies {
   testImplementation(project(":catalogs:catalog-common"))
   testImplementation(project(":integration-test-common", "testArtifacts"))
   testImplementation(libs.mockito.core)
-  testImplementation(libs.h2db)
   testImplementation(libs.mysql.driver)
   testImplementation(libs.postgresql.driver)
   testImplementation("org.apache.spark:spark-hive_$scalaVersion:$sparkVersion")

diff --git a/catalogs/catalog-hadoop/build.gradle.kts b/catalogs/catalog-hadoop/build.gradle.kts
@@ -68,10 +68,9 @@ dependencies {
   implementation(libs.slf4j.api)
 
   testImplementation(project(":integration-test-common", "testArtifacts"))
-
+  testImplementation(libs.bundles.metrics)
   testImplementation(libs.minikdc)
   testImplementation(libs.hadoop3.minicluster)
-
   testImplementation(libs.bundles.log4j)
   testImplementation(libs.mockito.core)
   testImplementation(libs.mockito.inline)

diff --git a/catalogs/catalog-hive/build.gradle.kts b/catalogs/catalog-hive/build.gradle.kts
@@ -58,7 +58,7 @@ dependencies {
     exclude("com.google.code.findbugs", "sr305")
     exclude("com.tdunning", "json")
     exclude("com.zaxxer", "HikariCP")
-    exclude("io.dropwizard.metricss")
+    exclude("io.dropwizard.metrics")
     exclude("javax.transaction", "transaction-api")
     exclude("org.apache.ant")
     exclude("org.apache.avro")

diff --git a/catalogs/catalog-kafka/build.gradle.kts b/catalogs/catalog-kafka/build.gradle.kts
@@ -34,13 +34,12 @@ dependencies {
   implementation(project(":common")) {
     exclude("*")
   }
-
-  testImplementation(project(":integration-test-common", "testArtifacts"))
-
   implementation(libs.guava)
   implementation(libs.kafka.clients)
   implementation(libs.slf4j.api)
 
+  testImplementation(project(":integration-test-common", "testArtifacts"))
+  testImplementation(project(":core"))
   testImplementation(libs.commons.io)
   testImplementation(libs.curator.test)
   testImplementation(libs.kafka)

diff --git a/core/src/main/java/org/apache/gravitino/storage/relational/database/H2Database.java b/core/src/main/java/org/apache/gravitino/storage/relational/database/H2Database.java
@@ -54,6 +54,12 @@ public String startH2Database(Config config) {
 
     String connectionUrl = constructH2URI(originalJDBCUrl, storagePath);
 
+    try {
+      Class.forName("org.h2.Driver");
+    } catch (ClassNotFoundException e) {
+      throw new RuntimeException("Failed to load H2 driver.", e);
+    }
+
     try (Connection connection = DriverManager.getConnection(connectionUrl, username, password);
         Statement statement = connection.createStatement()) {
       String sqlContent =

diff --git a/integration-test-common/build.gradle.kts b/integration-test-common/build.gradle.kts
@@ -79,6 +79,7 @@ val testShadowJar by tasks.registering(ShadowJar::class) {
   archiveClassifier.set("tests-shadow")
   // avoid conflict with Spark test
   exclude("org/apache/logging/slf4j/**")
+//  exclude("com/fasterxml/jackson/**")
   relocate("org.eclipse.jetty", "org.apache.gravitino.it.shaded.org.eclipse.jetty")
   from(sourceSets["test"].output)
 }

diff --git a/spark-connector/v3.3/spark/build.gradle.kts b/spark-connector/v3.3/spark/build.gradle.kts
@@ -51,6 +51,14 @@ dependencies {
     exclude("org.apache.logging.log4j")
     exclude("org.slf4j")
   }
+  testImplementation(project(":server")) {
+    exclude("org.apache.logging.log4j")
+    exclude("org.slf4j")
+  }
+  testImplementation(project(":server-common")) {
+    exclude("org.apache.logging.log4j")
+    exclude("org.slf4j")
+  }
   testImplementation(project(":spark-connector:spark-common", "testArtifacts")) {
     exclude("com.fasterxml.jackson")
   }

diff --git a/spark-connector/v3.4/spark/build.gradle.kts b/spark-connector/v3.4/spark/build.gradle.kts
@@ -52,6 +52,14 @@ dependencies {
     exclude("org.apache.logging.log4j")
     exclude("org.slf4j")
   }
+  testImplementation(project(":server")) {
+    exclude("org.apache.logging.log4j")
+    exclude("org.slf4j")
+  }
+  testImplementation(project(":server-common")) {
+    exclude("org.apache.logging.log4j")
+    exclude("org.slf4j")
+  }
   testImplementation(project(":spark-connector:spark-common", "testArtifacts")) {
     exclude("com.fasterxml.jackson")
   }

diff --git a/spark-connector/v3.5/spark/build.gradle.kts b/spark-connector/v3.5/spark/build.gradle.kts
@@ -53,11 +53,17 @@ dependencies {
     exclude("org.apache.logging.log4j")
     exclude("org.slf4j")
   }
-  testImplementation(project(":spark-connector:spark-common", "testArtifacts")) {
-    exclude("com.fasterxml.jackson")
+  testImplementation(project(":server")) {
+    exclude("org.apache.logging.log4j")
+    exclude("org.slf4j")
+  }
+  testImplementation(project(":server-common")) {
     exclude("org.apache.logging.log4j")
     exclude("org.slf4j")
   }
+  testImplementation(project(":spark-connector:spark-common", "testArtifacts")) {
+    exclude("com.fasterxml.jackson")
+  }
 
   testImplementation(libs.hive2.common) {
     exclude("com.sun.jersey")