diff --git a/pom.xml b/pom.xml
index 866c4fb..ae23782 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.5.8</version>
+		<version>3.5.14</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>wanijo</groupId>
@@ -14,8 +14,8 @@
 	<name>wanijo2</name>
 	<description>Wanijo, second edition</description>
 	<properties>
-		<java.version>17</java.version>
-		<kotlin.version>1.9.25</kotlin.version>
+		<java.version>21</java.version>
+		<kotlin.version>2.3.21</kotlin.version>
 		<jdbi.version>3.47.0</jdbi.version>
 	</properties>
 	<dependencies>
@@ -45,12 +45,12 @@
 		<dependency>
 			<groupId>nz.net.ultraq.thymeleaf</groupId>
 			<artifactId>thymeleaf-layout-dialect</artifactId>
-			<version>3.3.0</version>
+			<version>4.0.1</version>
 		</dependency>
         <dependency>
             <groupId>org.commonmark</groupId>
             <artifactId>commonmark</artifactId>
-            <version>0.25.0</version>
+            <version>0.28.0</version>
         </dependency>
 
 		<!-- DATABASE -->
diff --git a/src/main/kotlin/wanijo/wanijo2/domain/event/AddDateFieldCommand.kt b/src/main/kotlin/wanijo/wanijo2/domain/event/AddDateFieldCommand.kt
index 4fe8f09..8d58cf8 100644
--- a/src/main/kotlin/wanijo/wanijo2/domain/event/AddDateFieldCommand.kt
+++ b/src/main/kotlin/wanijo/wanijo2/domain/event/AddDateFieldCommand.kt
@@ -10,11 +10,11 @@ import java.time.ZoneOffset
 import java.time.ZonedDateTime
 
 data class AddDateFieldCommand(
-    @Min(1)
+    @param:Min(1)
     val documentId: DocumentId,
-    @NotEmpty
+    @param:NotEmpty
     val dateName: String,
-    @NotEmpty
+    @param:NotEmpty
     val dateValue: LocalDateTime,
     val order: Int = 0,
 )
diff --git a/src/main/kotlin/wanijo/wanijo2/domain/event/AddLabelFieldCommand.kt b/src/main/kotlin/wanijo/wanijo2/domain/event/AddLabelFieldCommand.kt
index 54f09b4..12f96dd 100644
--- a/src/main/kotlin/wanijo/wanijo2/domain/event/AddLabelFieldCommand.kt
+++ b/src/main/kotlin/wanijo/wanijo2/domain/event/AddLabelFieldCommand.kt
@@ -6,11 +6,11 @@ import wanijo.wanijo2.domain.DocumentId
 import wanijo.wanijo2.domain.LabelField
 
 data class AddLabelFieldCommand(
-    @Min(1)
+    @param:Min(1)
     val documentId: DocumentId,
-    @NotEmpty
+    @param:NotEmpty
     val labelName: String,
-    @NotEmpty
+    @param:NotEmpty
     val labelValue: String,
     val order: Int = 0
 ) {
diff --git a/src/main/kotlin/wanijo/wanijo2/domain/event/AddLinkCommand.kt b/src/main/kotlin/wanijo/wanijo2/domain/event/AddLinkCommand.kt
index 574b5f9..c0ff394 100644
--- a/src/main/kotlin/wanijo/wanijo2/domain/event/AddLinkCommand.kt
+++ b/src/main/kotlin/wanijo/wanijo2/domain/event/AddLinkCommand.kt
@@ -4,8 +4,8 @@ import jakarta.validation.constraints.Min
 import wanijo.wanijo2.domain.DocumentId
 
 data class AddLinkCommand(
-    @Min(1)
+    @param:Min(1)
     val documentId: DocumentId,
-    @Min.List(Min(1))
+    @param:Min.List(Min(1))
     val otherDocuments: List<DocumentId>,
 )
diff --git a/src/main/kotlin/wanijo/wanijo2/domain/event/AssignTaggingCommand.kt b/src/main/kotlin/wanijo/wanijo2/domain/event/AssignTaggingCommand.kt
index 7c9befc..d3d9c4d 100644
--- a/src/main/kotlin/wanijo/wanijo2/domain/event/AssignTaggingCommand.kt
+++ b/src/main/kotlin/wanijo/wanijo2/domain/event/AssignTaggingCommand.kt
@@ -5,8 +5,8 @@ import wanijo.wanijo2.domain.DocumentId
 import wanijo.wanijo2.domain.TagId
 
 data class AssignTaggingCommand(
-    @Min(1)
+    @param:Min(1)
     val tagId: TagId,
-    @Min(1)
+    @param:Min(1)
     val documentId: DocumentId
 )
diff --git a/src/main/kotlin/wanijo/wanijo2/domain/event/DeleteDateFieldCommand.kt b/src/main/kotlin/wanijo/wanijo2/domain/event/DeleteDateFieldCommand.kt
index 1147b62..dbef36b 100644
--- a/src/main/kotlin/wanijo/wanijo2/domain/event/DeleteDateFieldCommand.kt
+++ b/src/main/kotlin/wanijo/wanijo2/domain/event/DeleteDateFieldCommand.kt
@@ -5,8 +5,8 @@ import wanijo.wanijo2.domain.DocumentId
 import wanijo.wanijo2.domain.FieldId
 
 data class DeleteDateFieldCommand(
-    @Min(1)
+    @param:Min(1)
     val documentId: DocumentId,
-    @Min(1)
+    @param:Min(1)
     val dateFieldId: FieldId
 )
diff --git a/src/main/kotlin/wanijo/wanijo2/domain/event/DeleteDocumentCommand.kt b/src/main/kotlin/wanijo/wanijo2/domain/event/DeleteDocumentCommand.kt
index 7aa6d71..b9874dc 100644
--- a/src/main/kotlin/wanijo/wanijo2/domain/event/DeleteDocumentCommand.kt
+++ b/src/main/kotlin/wanijo/wanijo2/domain/event/DeleteDocumentCommand.kt
@@ -4,6 +4,6 @@ import jakarta.validation.constraints.Min
 import wanijo.wanijo2.domain.DocumentId
 
 data class DeleteDocumentCommand(
-    @Min(1)
+    @param:Min(1)
     val documentId: DocumentId
 )
diff --git a/src/main/kotlin/wanijo/wanijo2/domain/event/DeleteLabelFieldCommand.kt b/src/main/kotlin/wanijo/wanijo2/domain/event/DeleteLabelFieldCommand.kt
index d2b6e48..6332363 100644
--- a/src/main/kotlin/wanijo/wanijo2/domain/event/DeleteLabelFieldCommand.kt
+++ b/src/main/kotlin/wanijo/wanijo2/domain/event/DeleteLabelFieldCommand.kt
@@ -5,8 +5,8 @@ import wanijo.wanijo2.domain.DocumentId
 import wanijo.wanijo2.domain.FieldId
 
 data class DeleteLabelFieldCommand(
-    @Min(1)
+    @param:Min(1)
     val documentId: DocumentId,
-    @Min(1)
+    @param:Min(1)
     val labelFieldId: FieldId
 )
diff --git a/src/main/kotlin/wanijo/wanijo2/domain/event/DeleteTaggingCommand.kt b/src/main/kotlin/wanijo/wanijo2/domain/event/DeleteTaggingCommand.kt
index 9ad1cb8..68fe88b 100644
--- a/src/main/kotlin/wanijo/wanijo2/domain/event/DeleteTaggingCommand.kt
+++ b/src/main/kotlin/wanijo/wanijo2/domain/event/DeleteTaggingCommand.kt
@@ -5,8 +5,8 @@ import wanijo.wanijo2.domain.DocumentId
 import wanijo.wanijo2.domain.TagId
 
 data class DeleteTaggingCommand(
-    @Min(1)
+    @param:Min(1)
     val tagId: TagId,
-    @Min(1)
+    @param:Min(1)
     val documentId: DocumentId
 )
diff --git a/src/main/kotlin/wanijo/wanijo2/domain/event/EditDocumentCommand.kt b/src/main/kotlin/wanijo/wanijo2/domain/event/EditDocumentCommand.kt
index 7a1601f..5dc05cc 100644
--- a/src/main/kotlin/wanijo/wanijo2/domain/event/EditDocumentCommand.kt
+++ b/src/main/kotlin/wanijo/wanijo2/domain/event/EditDocumentCommand.kt
@@ -8,9 +8,9 @@ import wanijo.wanijo2.domain.DocumentId
 import wanijo.wanijo2.domain.DocumentName
 
 data class EditDocumentCommand(
-    @Min(0)
+    @param:Min(0)
     val id: DocumentId,
-    @NotEmpty
+    @param:NotEmpty
     val name: DocumentName,
     val description: DocumentDescription
 ) {
diff --git a/src/main/kotlin/wanijo/wanijo2/domain/event/NewDocumentCommand.kt b/src/main/kotlin/wanijo/wanijo2/domain/event/NewDocumentCommand.kt
index 92bccd0..e948530 100644
--- a/src/main/kotlin/wanijo/wanijo2/domain/event/NewDocumentCommand.kt
+++ b/src/main/kotlin/wanijo/wanijo2/domain/event/NewDocumentCommand.kt
@@ -3,7 +3,7 @@ package wanijo.wanijo2.domain.event
 import jakarta.validation.constraints.NotEmpty
 
 data class NewDocumentCommand(
-    @NotEmpty
+    @param:NotEmpty
     val name: String = "",
     val description: String = "",
     val tagIds: List<Long> = emptyList(),