From f2206b0708abcb02bd4fee9adf04deff1cbfeceb Mon Sep 17 00:00:00 2001
From: Jerry Shao <jshao@apache.org>
Date: Tue, 31 Dec 2024 16:36:08 +0800
Subject: [PATCH] Address the comments

---
 catalogs/catalog-model/build.gradle.kts            | 14 ++++++++------
 .../integration/test/ModelCatalogOperationsIT.java |  1 -
 .../src/test/resources/log4j2.properties           |  4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/catalogs/catalog-model/build.gradle.kts b/catalogs/catalog-model/build.gradle.kts
index 95af305fcae..299afd45e82 100644
--- a/catalogs/catalog-model/build.gradle.kts
+++ b/catalogs/catalog-model/build.gradle.kts
@@ -29,17 +29,15 @@ dependencies {
     exclude(group = "*")
   }
 
-  implementation(project(":core")) {
+  implementation(project(":catalogs:catalog-common")) {
     exclude(group = "*")
   }
   implementation(project(":common")) {
     exclude(group = "*")
   }
-
-  implementation(project(":catalogs:catalog-common")) {
+  implementation(project(":core")) {
     exclude(group = "*")
   }
-
   implementation(libs.guava)
   implementation(libs.slf4j.api)
 
@@ -47,7 +45,6 @@ dependencies {
   testImplementation(project(":integration-test-common", "testArtifacts"))
   testImplementation(project(":server"))
   testImplementation(project(":server-common"))
-
   testImplementation(libs.bundles.log4j)
   testImplementation(libs.commons.io)
   testImplementation(libs.commons.lang3)
@@ -55,6 +52,10 @@ dependencies {
   testImplementation(libs.mockito.inline)
   testImplementation(libs.junit.jupiter.api)
   testImplementation(libs.junit.jupiter.params)
+  testImplementation(libs.mysql.driver)
+  testImplementation(libs.postgresql.driver)
+  testImplementation(libs.testcontainers)
+  testImplementation(libs.testcontainers.mysql)
 
   testRuntimeOnly(libs.junit.jupiter.engine)
 }
@@ -68,8 +69,9 @@ tasks {
   val copyCatalogLibs by registering(Copy::class) {
     dependsOn("jar", "runtimeJars")
     from("build/libs") {
-      exclude("slf4j-*.jar")
       exclude("guava-*.jar")
+      exclude("log4j-*.jar")
+      exclude("slf4j-*.jar")
     }
     into("$rootDir/distribution/package/catalogs/model/libs")
   }
diff --git a/catalogs/catalog-model/src/test/java/org/apache/gravtitino/catalog/model/integration/test/ModelCatalogOperationsIT.java b/catalogs/catalog-model/src/test/java/org/apache/gravtitino/catalog/model/integration/test/ModelCatalogOperationsIT.java
index d69690af219..2dbb52505b2 100644
--- a/catalogs/catalog-model/src/test/java/org/apache/gravtitino/catalog/model/integration/test/ModelCatalogOperationsIT.java
+++ b/catalogs/catalog-model/src/test/java/org/apache/gravtitino/catalog/model/integration/test/ModelCatalogOperationsIT.java
@@ -49,7 +49,6 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
-@Tag("gravitino-docker-test")
 public class ModelCatalogOperationsIT extends BaseIT {
 
   private String metalakeName = GravitinoITUtils.genRandomName("model_it_metalake");
diff --git a/catalogs/catalog-model/src/test/resources/log4j2.properties b/catalogs/catalog-model/src/test/resources/log4j2.properties
index c71b642a931..88da637c15d 100644
--- a/catalogs/catalog-model/src/test/resources/log4j2.properties
+++ b/catalogs/catalog-model/src/test/resources/log4j2.properties
@@ -30,7 +30,7 @@ appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p [%t] %c{1}:%L - %m%n
 
 # Log files location
-property.logPath = ${sys:gravitino.log.path:-build/catalog-hadoop-integration-test.log}
+property.logPath = ${sys:gravitino.log.path:-build/catalog-model-integration-test.log}
 
 # File appender configuration
 appender.file.type = File
@@ -70,4 +70,4 @@ logger.docker.additivity = false
 logger.docker.appenderRef.file.ref = testcontainersLogger
 
 logger.http.name = com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.wire
-logger.http.level = off
\ No newline at end of file
+logger.http.level = off