diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b83032e..7932023 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,23 +19,22 @@ jobs:
           distribution: 'zulu'
           java-version: 21
 
-      - name: Grant execute permission for ./gradlew
+      - name: Grant execute permission for codegen/gradlew
+        working-directory: ./codegen
         run: chmod +x gradlew
 
-      - name: Grant execute permission for codegen-test/gradlew
-        working-directory: ./codegen-test
-        run: chmod +x gradlew
+      - name: Build
+        working-directory: ./codegen
+        run: ./gradlew build
 
-      - name: Assemble and Check
-        run: ./gradlew assemble check
+      - name: Grant execute permission for ./gradlew
+        run: chmod +x gradlew
 
       - name: Test plugin (generate Java code)
-        working-directory: ./codegen-test
-        run: ./gradlew domaCodeGenJavaAll build
+        run: ./gradlew clean domaCodeGenJavaAll build
 
       - name: Test plugin (generate Kotlin code)
-        working-directory: ./codegen-test
-        run: ./gradlew domaCodeGenKotlinAll build
+        run: ./gradlew clean domaCodeGenKotlinAll build
 
       - name: Set version
         id: set-version
@@ -46,4 +45,5 @@ jobs:
 
       - name: Publish plugin
         if: github.event_name == 'push' && endsWith(steps.set-version.outputs.version, 'SNAPSHOT') == false
+        working-directory: ./codegen
         run: ./gradlew publishPlugins -Pgradle.publish.key=${{ secrets.GRADLE_PUBLISH_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_PUBLISH_SECRET }}
diff --git a/.gitignore b/.gitignore
index bd2fe4d..cbaaccb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,11 @@
 /.idea/
 .factorypath
 /.claude/
+/data/
+/.apt_generated/
+
+/src/main/java/codegen
+/src/main/kotlin/codegen
+/src/main/resources/META-INF/codegen
+/src/test/java/codegen
+/src/test/kotlin/codegen
diff --git a/build.gradle.kts b/build.gradle.kts
index 1fa6789..0825661 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,11 @@
+import org.seasar.doma.gradle.codegen.desc.LanguageType
+
 plugins {
     java
-    id("net.researchgate.release") version "3.1.0"
+    alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.doma.compile)
+    alias(libs.plugins.release)
+    id("org.domaframework.doma.codegen")
 }
 
 configure<net.researchgate.release.ReleaseExtension> {
@@ -11,11 +16,87 @@ configure<net.researchgate.release.ReleaseExtension> {
     }
 }
 
-allprojects {
-    apply(plugin = "java")
-    tasks {
-        test {
-            useJUnitPlatform()
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
+
+dependencies {
+    implementation(libs.doma.core)
+    annotationProcessor(libs.doma.processor)
+
+    // Use JUnit BOM for version management
+    testImplementation(platform(libs.junit.bom))
+    testImplementation(libs.junit.jupiter.api)
+    testRuntimeOnly(libs.junit.jupiter.engine)
+    testRuntimeOnly(libs.junit.platform.launcher)
+
+    testRuntimeOnly(platform(libs.testcontainers.bom))
+    testRuntimeOnly(libs.testcontainers.postgresql)
+    testRuntimeOnly(libs.postgresql)
+
+    domaCodeGen(platform(libs.testcontainers.bom))
+    domaCodeGen(libs.testcontainers.postgresql)
+    domaCodeGen(libs.postgresql)
+}
+
+val initScript = file("init_postgresql.sql")
+val _url = "jdbc:tc:postgresql:13.21:///test?TC_INITSCRIPT=file:${initScript.absolutePath}"
+val _user = ""
+val _password = ""
+
+domaCodeGen {
+    register("java") {
+        val basePackage = "codegen"
+        url.set(_url)
+        user.set(_user)
+        password.set(_password)
+        entity {
+            packageName = "${basePackage}.j.entity"
+        }
+        dao {
+            packageName = "${basePackage}.j.dao"
+        }
+    }
+    register("kotlin") {
+        val basePackage = "codegen"
+        url.set(_url)
+        user.set(_user)
+        password.set(_password)
+        languageType.set(LanguageType.KOTLIN)
+        entity {
+            packageName = "${basePackage}.k.entity"
+        }
+        dao {
+            packageName = "${basePackage}.k.dao"
         }
     }
 }
+
+tasks {
+    test {
+        useJUnitPlatform()
+    }
+
+    val deleteSrc = register("deleteSrc") {
+        doLast {
+            delete("src/main/java/codegen")
+            delete("src/main/kotlin/codegen")
+            delete("src/main/resources/META-INF/codegen")
+            delete("src/test/java/codegen")
+            delete("src/test/kotlin/codegen")
+        }
+    }
+
+    clean {
+        dependsOn(deleteSrc)
+    }
+
+    build {
+        mustRunAfter("domaCodeGenJavaAll", "domaCodeGenKotlinAll")
+    }
+}
\ No newline at end of file
diff --git a/codegen-test/.gitignore b/codegen-test/.gitignore
deleted file mode 100644
index b2295f6..0000000
--- a/codegen-test/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-/.classpath
-/.gradle/
-/.project
-/.settings/
-/bin/
-/build/
-/src/
-/target/
-/data/
-/.metadata
-/.idea/
-/.apt_generated/
diff --git a/codegen-test/build.gradle.kts b/codegen-test/build.gradle.kts
deleted file mode 100644
index a2b9559..0000000
--- a/codegen-test/build.gradle.kts
+++ /dev/null
@@ -1,125 +0,0 @@
-import org.seasar.doma.gradle.codegen.desc.LanguageType
-
-buildscript {
-    repositories {
-        mavenCentral()
-        mavenLocal()
-        maven {
-            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
-        }
-    }
-    dependencies {
-        classpath("org.domaframework.doma:codegen")
-    }
-}
-
-plugins {
-    id("java")
-    id("org.jetbrains.kotlin.jvm") version "2.2.0"
-    id("org.domaframework.doma.compile") version "4.0.0"
-    id("org.domaframework.doma.codegen")
-    id("com.nocwriter.runsql") version "1.0.3"
-}
-
-java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
-}
-
-repositories {
-    mavenLocal()
-    mavenCentral()
-}
-
-dependencies {
-    val domaVersion: String by project
-    val h2Version: String by project
-
-    implementation("org.seasar.doma:doma-core:$domaVersion")
-    annotationProcessor("org.seasar.doma:doma-processor:$domaVersion")
-
-    // Use JUnit BOM for version management
-    testImplementation(platform("org.junit:junit-bom:5.13.2"))
-    testImplementation("org.junit.jupiter:junit-jupiter-api")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-    testRuntimeOnly("com.h2database:h2:$h2Version")
-
-    // Add H2 to the domaCodeGen configuration
-    domaCodeGen("com.h2database:h2:$h2Version")
-
-    // Used by runsql-gradle-plugin
-    runtimeOnly("com.h2database:h2:$h2Version")
-}
-
-val _url = "jdbc:h2:file:$projectDir/data/db"
-val _user = ""
-val _password = ""
-
-domaCodeGen {
-    register("java") {
-        val basePackage = "codegen"
-        url.set(_url.toString())
-        user.set(_user)
-        password.set(_password)
-        entity {
-            packageName = "${basePackage}.entity"
-        }
-        dao {
-            packageName = "${basePackage}.dao"
-        }
-    }
-    register("kotlin") {
-        val basePackage = "codegen"
-        url.set(_url.toString())
-        user.set(_user)
-        password.set(_password)
-        languageType.set(LanguageType.KOTLIN)
-        entity {
-            packageName = "${basePackage}.entity"
-        }
-        dao {
-            packageName = "${basePackage}.dao"
-        }
-    }
-}
-
-tasks {
-    test {
-        useJUnitPlatform()
-    }
-
-    val deleteSrc = register("deleteSrc") {
-        doLast {
-            delete("src")
-        }
-    }
-
-    val createDb = register<RunSQL>("createDb") {
-        config {
-            username = _user
-            password = _password
-            url = _url
-            driverClassName = "org.h2.Driver"
-            script = """
-            drop all objects;
-
-            create table department(
-                department_id integer not null primary key, 
-                department_no integer not null,
-                department_name varchar(20),
-                location varchar(20) default 'tokyo', 
-                version integer
-             );
-
-            create table employee(
-                employee_id integer not null primary key, 
-                employee_no integer not null,
-                employee_name varchar(20)
-            );                
-            """.trimIndent()
-        }
-    }
-
-    getByName("domaCodeGenJavaDbMeta").dependsOn(deleteSrc, createDb)
-    getByName("domaCodeGenKotlinDbMeta").dependsOn(deleteSrc, createDb)
-}
diff --git a/codegen-test/docker-compose.yml b/codegen-test/docker-compose.yml
deleted file mode 100644
index 73b2574..0000000
--- a/codegen-test/docker-compose.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Use root/example as user/password credentials
-version: '3.1'
-
-services:
-
-  db:
-    image: mysql
-    command: --default-authentication-plugin=mysql_native_password
-    restart: always
-    environment:
-      MYSQL_ROOT_PASSWORD: example
-    ports:
-      - 3306:3306
-
-  adminer:
-    image: adminer
-    restart: always
-    ports:
-      - 8080:8080
\ No newline at end of file
diff --git a/codegen-test/gradle.properties b/codegen-test/gradle.properties
deleted file mode 100644
index 5aadb90..0000000
--- a/codegen-test/gradle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-domaVersion=3.9.1
-h2Version=2.3.232
diff --git a/codegen-test/gradle/wrapper/gradle-wrapper.jar b/codegen-test/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 5c2d1cf..0000000
Binary files a/codegen-test/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/codegen-test/gradle/wrapper/gradle-wrapper.properties b/codegen-test/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 1e2fbf0..0000000
--- a/codegen-test/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/codegen-test/gradlew b/codegen-test/gradlew
deleted file mode 100755
index b0d6d0a..0000000
--- a/codegen-test/gradlew
+++ /dev/null
@@ -1,188 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
diff --git a/codegen-test/gradlew.bat b/codegen-test/gradlew.bat
deleted file mode 100644
index 9991c50..0000000
--- a/codegen-test/gradlew.bat
+++ /dev/null
@@ -1,100 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/codegen-test/settings.gradle.kts b/codegen-test/settings.gradle.kts
deleted file mode 100644
index a7055af..0000000
--- a/codegen-test/settings.gradle.kts
+++ /dev/null
@@ -1,5 +0,0 @@
-rootProject.name = "codegen-test"
-
-pluginManagement {
-    includeBuild("../codegen")
-}
diff --git a/codegen/build.gradle.kts b/codegen/build.gradle.kts
index 4b0680c..7e2431e 100644
--- a/codegen/build.gradle.kts
+++ b/codegen/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
-    id("groovy")
-    id("java-gradle-plugin")
-    id("com.diffplug.spotless") version "7.0.4"
-    id("com.gradle.plugin-publish") version "1.3.1"
+    groovy
+    `java-gradle-plugin`
+    alias(libs.plugins.spotless)
+    alias(libs.plugins.plugin.publish)
 }
 
 gradlePlugin {
@@ -32,7 +32,7 @@ sourceSets {
 
 spotless {
     java {
-        googleJavaFormat("1.23.0")
+        googleJavaFormat(libs.versions.googleJavaFormat.get())
     }
     groovy {
     }
@@ -50,15 +50,15 @@ repositories {
 }
 
 dependencies {
-    implementation("org.freemarker:freemarker:2.3.34")
-    testImplementation("org.seasar.doma:doma-core:3.9.1")
+    implementation(libs.freemarker)
+    testImplementation(libs.doma.core)
     
     // Use JUnit BOM for version management
-    testImplementation(platform("org.junit:junit-bom:5.13.2"))
-    testImplementation("org.junit.jupiter:junit-jupiter-api")
-    testImplementation("org.junit.jupiter:junit-jupiter-params")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+    testImplementation(platform(libs.junit.bom))
+    testImplementation(libs.junit.jupiter.api)
+    testImplementation(libs.junit.jupiter.params)
+    testRuntimeOnly(libs.junit.jupiter.engine)
+    testRuntimeOnly(libs.junit.platform.launcher)
 }
 
 tasks {
diff --git a/codegen/settings.gradle.kts b/codegen/settings.gradle.kts
index df94a6a..3838de7 100644
--- a/codegen/settings.gradle.kts
+++ b/codegen/settings.gradle.kts
@@ -1 +1,9 @@
 rootProject.name = "codegen"
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
diff --git a/gradle.properties b/gradle.properties
index 8e31f30..0c281d9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,4 @@
 group=org.domaframework.doma
 version=3.2.1-SNAPSHOT
 release.useAutomaticVersion=true
+domaVersion=3.9.1
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..ea3904e
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,58 @@
+[versions]
+# Core dependencies
+doma = "3.9.1"
+freemarker = "2.3.34"
+postgresql = "42.7.7"
+
+# Testing
+junit = "5.13.2"
+testcontainers = "1.21.2"
+
+# Plugins
+kotlin = "2.2.0"
+domaCompile = "4.0.0"
+runsql = "1.0.3"
+release = "3.1.0"
+spotless = "7.0.4"
+pluginPublish = "1.3.1"
+
+# Code formatting
+googleJavaFormat = "1.23.0"
+
+[libraries]
+# Doma framework
+doma-core = { group = "org.seasar.doma", name = "doma-core", version.ref = "doma" }
+doma-processor = { group = "org.seasar.doma", name = "doma-processor", version.ref = "doma" }
+
+# Template engine
+freemarker = { group = "org.freemarker", name = "freemarker", version.ref = "freemarker" }
+
+# Database drivers
+postgresql = { group = "org.postgresql", name = "postgresql", version.ref = "postgresql" }
+
+# Testing - BOMs
+junit-bom = { group = "org.junit", name = "junit-bom", version.ref = "junit" }
+testcontainers-bom = { group = "org.testcontainers", name = "testcontainers-bom", version.ref = "testcontainers" }
+
+# Testing - Libraries (versions managed by BOMs)
+junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api" }
+junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine" }
+junit-jupiter-params = { group = "org.junit.jupiter", name = "junit-jupiter-params" }
+junit-platform-launcher = { group = "org.junit.platform", name = "junit-platform-launcher" }
+testcontainers-postgresql = { group = "org.testcontainers", name = "postgresql" }
+
+[plugins]
+# Kotlin
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+
+# Doma
+doma-compile = { id = "org.domaframework.doma.compile", version.ref = "domaCompile" }
+
+# Release management
+release = { id = "net.researchgate.release", version.ref = "release" }
+
+# Code quality
+spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
+
+# Publishing
+plugin-publish = { id = "com.gradle.plugin-publish", version.ref = "pluginPublish" }
\ No newline at end of file
diff --git a/init_postgresql.sql b/init_postgresql.sql
new file mode 100644
index 0000000..eb41e6b
--- /dev/null
+++ b/init_postgresql.sql
@@ -0,0 +1,38 @@
+CREATE TABLE IF NOT EXISTS DEPARTMENT(DEPARTMENT_ID INTEGER NOT NULL PRIMARY KEY, DEPARTMENT_NO INTEGER NOT NULL UNIQUE,DEPARTMENT_NAME VARCHAR(20),LOCATION VARCHAR(20) DEFAULT 'TOKYO', VERSION INTEGER);
+CREATE TABLE IF NOT EXISTS ADDRESS(ADDRESS_ID INTEGER NOT NULL PRIMARY KEY, STREET VARCHAR(20) UNIQUE, VERSION INTEGER);
+CREATE TABLE IF NOT EXISTS EMPLOYEE(EMPLOYEE_ID INTEGER NOT NULL PRIMARY KEY, EMPLOYEE_NO INTEGER NOT NULL ,EMPLOYEE_NAME VARCHAR(20),MANAGER_ID INTEGER,HIREDATE DATE,SALARY NUMERIC(7,2),DEPARTMENT_ID INTEGER,ADDRESS_ID INTEGER, VERSION INTEGER, CONSTRAINT FK_DEPARTMENT_ID FOREIGN KEY(DEPARTMENT_ID) REFERENCES DEPARTMENT(DEPARTMENT_ID), CONSTRAINT FK_ADDRESS_ID FOREIGN KEY(ADDRESS_ID) REFERENCES ADDRESS(ADDRESS_ID));
+CREATE TABLE IF NOT EXISTS COMP_KEY_ADDRESS(ADDRESS_ID1 INTEGER NOT NULL, ADDRESS_ID2 INTEGER NOT NULL, STREET VARCHAR(20), VERSION INTEGER, CONSTRAINT PK_COMP_KEY_ADDRESS PRIMARY KEY(ADDRESS_ID1, ADDRESS_ID2));
+
+INSERT INTO DEPARTMENT VALUES(1,10,'ACCOUNTING','NEW YORK',1);
+INSERT INTO DEPARTMENT VALUES(2,20,'RESEARCH','DALLAS',1);
+INSERT INTO DEPARTMENT VALUES(3,30,'SALES','CHICAGO',1);
+INSERT INTO DEPARTMENT VALUES(4,40,'OPERATIONS','BOSTON',1);
+INSERT INTO ADDRESS VALUES(1,'STREET 1',1);
+INSERT INTO ADDRESS VALUES(2,'STREET 2',1);
+INSERT INTO ADDRESS VALUES(3,'STREET 3',1);
+INSERT INTO ADDRESS VALUES(4,'STREET 4',1);
+INSERT INTO ADDRESS VALUES(5,'STREET 5',1);
+INSERT INTO ADDRESS VALUES(6,'STREET 6',1);
+INSERT INTO ADDRESS VALUES(7,'STREET 7',1);
+INSERT INTO ADDRESS VALUES(8,'STREET 8',1);
+INSERT INTO ADDRESS VALUES(9,'STREET 9',1);
+INSERT INTO ADDRESS VALUES(10,'STREET 10',1);
+INSERT INTO ADDRESS VALUES(11,'STREET 11',1);
+INSERT INTO ADDRESS VALUES(12,'STREET 12',1);
+INSERT INTO ADDRESS VALUES(13,'STREET 13',1);
+INSERT INTO ADDRESS VALUES(14,'STREET 14',1);
+INSERT INTO ADDRESS VALUES(15,'STREET 15',1);
+INSERT INTO EMPLOYEE VALUES(1,7369,'SMITH',13,'1980-12-17',800,2,1,1);
+INSERT INTO EMPLOYEE VALUES(2,7499,'ALLEN',6,'1981-02-20',1600,3,2,1);
+INSERT INTO EMPLOYEE VALUES(3,7521,'WARD',6,'1981-02-22',1250,3,3,1);
+INSERT INTO EMPLOYEE VALUES(4,7566,'JONES',9,'1981-04-02',2975,2,4,1);
+INSERT INTO EMPLOYEE VALUES(5,7654,'MARTIN',6,'1981-09-28',1250,3,5,1);
+INSERT INTO EMPLOYEE VALUES(6,7698,'BLAKE',9,'1981-05-01',2850,3,6,1);
+INSERT INTO EMPLOYEE VALUES(7,7782,'CLARK',9,'1981-06-09',2450,1,7,1);
+INSERT INTO EMPLOYEE VALUES(8,7788,'SCOTT',4,'1982-12-09',3000.0,2,8,1);
+INSERT INTO EMPLOYEE VALUES(9,7839,'KING',NULL,'1981-11-17',5000,1,9,1);
+INSERT INTO EMPLOYEE VALUES(10,7844,'TURNER',6,'1981-09-08',1500,3,10,1);
+INSERT INTO EMPLOYEE VALUES(11,7876,'ADAMS',8,'1983-01-12',1100,2,11,1);
+INSERT INTO EMPLOYEE VALUES(12,7900,'JAMES',6,'1981-12-03',950,3,12,1);
+INSERT INTO EMPLOYEE VALUES(13,7902,'FORD',4,'1981-12-03',3000,2,13,1);
+INSERT INTO EMPLOYEE VALUES(14,7934,'MILLER',7,'1982-01-23',1300,1,14,1);
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1c4cb9a..22c2b0c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,3 +1,5 @@
 rootProject.name = "doma-codegen-plugin"
 
-include("codegen")
+pluginManagement {
+    includeBuild("codegen")
+}
diff --git a/codegen-test/template/entity.ftl b/template/entity.ftl
similarity index 100%
rename from codegen-test/template/entity.ftl
rename to template/entity.ftl