Use Doma 3

domaframework · Aug 31, 2024 · c1fcfbb · c1fcfbb
1 parent 03e588c
commit c1fcfbb
Show file tree

Hide file tree

Showing 20 changed files with 6 additions and 487 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -39,8 +39,8 @@ subprojects {
         annotationProcessor("org.seasar.doma:doma-processor:${domaVersion}")
         implementation("org.seasar.doma:doma-core:${domaVersion}")
         implementation("org.seasar.doma:doma-slf4j:${domaVersion}")
-        runtimeOnly("ch.qos.logback:logback-classic:1.2.11")
-        runtimeOnly("com.h2database:h2:2.2.224")
+        runtimeOnly("ch.qos.logback:logback-classic:1.5.7")
+        runtimeOnly("com.h2database:h2:2.3.232")
         testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.0")
         testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.0")
     }
@@ -69,7 +69,7 @@ subprojects {
 
     spotless {
         java {
-            googleJavaFormat("1.19.2")
+            googleJavaFormat("1.23.0")
         }
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-domaVersion=2.62.1
+domaVersion=3.0.0
diff --git a/java-17/src/main/java/boilerplate/java17/dao/AppDao.java b/java-17/src/main/java/boilerplate/java17/dao/AppDao.java
@@ -24,7 +24,8 @@ name varchar(255) not null,
   @Script
   void create();
 
-  @Sql("""
+  @Sql(
+      """
         drop sequence employee_seq;
         drop table employee;
         """)

diff --git a/java-8/.gitignore b/java-8/.gitignore
diff --git a/java-8/build.gradle.kts b/java-8/build.gradle.kts
diff --git a/java-8/src/main/java/boilerplate/java8/DbConfig.java b/java-8/src/main/java/boilerplate/java8/DbConfig.java
diff --git a/java-8/src/main/java/boilerplate/java8/Main.java b/java-8/src/main/java/boilerplate/java8/Main.java
diff --git a/java-8/src/main/java/boilerplate/java8/dao/AppDao.java b/java-8/src/main/java/boilerplate/java8/dao/AppDao.java
diff --git a/java-8/src/main/java/boilerplate/java8/dao/EmployeeDao.java b/java-8/src/main/java/boilerplate/java8/dao/EmployeeDao.java
diff --git a/java-8/src/main/java/boilerplate/java8/entity/Employee.java b/java-8/src/main/java/boilerplate/java8/entity/Employee.java
diff --git a/java-8/src/main/java/boilerplate/java8/repository/EmployeeRepository.java b/java-8/src/main/java/boilerplate/java8/repository/EmployeeRepository.java
diff --git a/java-8/src/main/resources/META-INF/boilerplate/java8/dao/AppDao/create.script b/java-8/src/main/resources/META-INF/boilerplate/java8/dao/AppDao/create.script
diff --git a/java-8/src/main/resources/META-INF/boilerplate/java8/dao/AppDao/drop.script b/java-8/src/main/resources/META-INF/boilerplate/java8/dao/AppDao/drop.script
diff --git a/java-8/src/main/resources/META-INF/boilerplate/java8/dao/EmployeeDao/selectAll.sql b/java-8/src/main/resources/META-INF/boilerplate/java8/dao/EmployeeDao/selectAll.sql
diff --git a/java-8/src/main/resources/META-INF/boilerplate/java8/dao/EmployeeDao/selectById.sql b/java-8/src/main/resources/META-INF/boilerplate/java8/dao/EmployeeDao/selectById.sql
diff --git a/java-8/src/main/resources/logback.xml b/java-8/src/main/resources/logback.xml
diff --git a/java-8/src/test/java/boilerplate/java8/TestEnvironment.java b/java-8/src/test/java/boilerplate/java8/TestEnvironment.java
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,8 @@ name varchar(255) not null, @@
       @Script
       void create();
-      @Sql("""
+      @Sql(
+          """
             drop sequence employee_seq;
             drop table employee;
             """)
@@ Expand Down @@