diff --git a/build.gradle b/build.gradle
index 498be03..be6a557 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,37 +1,32 @@
+import java.nio.charset.StandardCharsets
+
 plugins {
 	id 'java'
 	id 'war'
-	id 'org.springframework.boot' version '3.4.5' apply false
+	id 'org.springframework.boot' version '3.4.5'
 	id 'io.spring.dependency-management' version '1.1.7'
 }
 
+tasks.processResources {
+    filteringCharset = 'UTF-8'
+}
+
 group = 'com.bsmlab.dfx'
 version = '0.1'
 
-// git commit hash -> application.yml
-def gitCommitId = ''
-try {
-    def stdout = new ByteArrayOutputStream()
-    providers.exec {
-        commandLine 'git', 'rev-parse', '--short', 'HEAD'
-        standardOutput = stdout;
-    }.result.get()
-    gitCommitId = stdout.toString().trim()
-}
-catch (Exception ignored) {
-    print "git commit ID is not available."
-}
-
-// gradle project properties -> application.yml
-processResources {
+tasks.processResources {
+    filteringCharset = 'UTF-8'
     filesMatching('**/application.yml') {
-        expand(project.properties + [
-                commitId: gitCommitId, version: version,
-                user: [home: System.getProperty('user.home')]
+        def commitId = providers.exec {
+            commandLine 'git', 'rev-parse', '--short', 'HEAD'
+        }.standardOutput.asText.get()
+        expand([
+                commitId: commitId,
+                version : project.version,
+                user    : [home: System.getProperty('user.home')]
         ])
     }
 }
-
 java {
 	toolchain {
 		languageVersion = JavaLanguageVersion.of(17)
@@ -42,16 +37,16 @@ repositories {
 	mavenCentral()
 }
 
-apply plugin: 'org.springframework.boot'
-apply plugin: 'io.spring.dependency-management'
-apply plugin: 'war'
-
 bootWar {
 	enabled = true
 }
 
 bootJar {
-	enabled = false
+    enabled = false
+}
+
+war {
+    enabled = true
 }
 
 dependencies {
diff --git a/gradlew.bat b/gradlew.bat
index 9d21a21..8340a77 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -38,6 +38,8 @@ for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 @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"
 
+set JAVA_HOME=C:/Program Files/Java/jdk-17
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome