Merge branch 'master' into refactor/kotlin-dsl

# Conflicts:
#	codegen-test/build.gradle

Author: nakamura-to

codegen-test/build.gradle.kts

@@ -43,8 +43,8 @@ dependencies {
 
     implementation("org.seasar.doma:doma-core:$domaVersion")
     annotationProcessor("org.seasar.doma:doma-processor:$domaVersion")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.1")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.1")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.2")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.2")
     testRuntimeOnly("com.h2database:h2:$h2Version")
 }
 

codegen/build.gradle.kts

@@ -51,10 +51,10 @@ repositories {
 
 dependencies {
     implementation("org.freemarker:freemarker:2.3.33")
-    testImplementation("org.seasar.doma:doma-core:3.0.0")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.1")
-    testImplementation("org.junit.jupiter:junit-jupiter-params:5.11.1")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.1")
+    testImplementation("org.seasar.doma:doma-core:3.0.1")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.2")
+    testImplementation("org.junit.jupiter:junit-jupiter-params:5.11.2")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.2")
 }
 
 tasks {