diff --git a/pom.xml b/pom.xml
index f48a01281..c61473950 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1230,7 +1230,7 @@
 		<dependency>
 			<groupId>org.codelibs</groupId>
 			<artifactId>corelib</artifactId>
-			<version>0.3.6</version>
+			<version>0.3.7-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codelibs</groupId>
diff --git a/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java b/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java
index 065442213..6b81500ed 100644
--- a/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java
+++ b/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java
@@ -27,7 +27,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.apache.commons.io.IOUtils;
+import org.codelibs.core.io.CloseableUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.app.service.FailureUrlService;
 import org.codelibs.fess.crawler.builder.RequestDataBuilder;
@@ -183,7 +183,7 @@ public class FessCrawlerThread extends CrawlerThread {
                 }
             } finally {
                 if (responseData != null) {
-                    IOUtils.closeQuietly(responseData);
+                    CloseableUtil.closeQuietly(responseData);
                 }
             }
         }
diff --git a/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiFile.java b/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiFile.java
index 44e3e175d..a11598d2b 100644
--- a/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiFile.java
+++ b/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiFile.java
@@ -31,7 +31,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.io.IOUtils;
+import org.codelibs.core.io.CloseableUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.dict.DictionaryException;
@@ -276,7 +276,7 @@ public class KuromojiFile extends DictionaryFile<KuromojiItem> {
             } catch (final IOException e) {
                 // ignore
             }
-            IOUtils.closeQuietly(writer);
+            CloseableUtil.closeQuietly(writer);
 
             if (isCommit) {
                 try {
diff --git a/src/main/java/org/codelibs/fess/dict/mapping/CharMappingFile.java b/src/main/java/org/codelibs/fess/dict/mapping/CharMappingFile.java
index 66fa283ad..4b7889110 100644
--- a/src/main/java/org/codelibs/fess/dict/mapping/CharMappingFile.java
+++ b/src/main/java/org/codelibs/fess/dict/mapping/CharMappingFile.java
@@ -33,7 +33,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.io.IOUtils;
+import org.codelibs.core.io.CloseableUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.dict.DictionaryException;
@@ -290,7 +290,7 @@ public class CharMappingFile extends DictionaryFile<CharMappingItem> {
             } catch (final IOException e) {
                 // ignore
             }
-            IOUtils.closeQuietly(writer);
+            CloseableUtil.closeQuietly(writer);
 
             if (isCommit) {
                 try {
diff --git a/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsFile.java b/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsFile.java
index 71224960d..2a18f1211 100644
--- a/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsFile.java
+++ b/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsFile.java
@@ -31,7 +31,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.io.IOUtils;
+import org.codelibs.core.io.CloseableUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.dict.DictionaryException;
@@ -276,7 +276,7 @@ public class ProtwordsFile extends DictionaryFile<ProtwordsItem> {
             } catch (final IOException e) {
                 // ignore
             }
-            IOUtils.closeQuietly(writer);
+            CloseableUtil.closeQuietly(writer);
 
             if (isCommit) {
                 try {
diff --git a/src/main/java/org/codelibs/fess/dict/seunjeon/SeunjeonFile.java b/src/main/java/org/codelibs/fess/dict/seunjeon/SeunjeonFile.java
index aa7e14cb1..a9cc0b607 100644
--- a/src/main/java/org/codelibs/fess/dict/seunjeon/SeunjeonFile.java
+++ b/src/main/java/org/codelibs/fess/dict/seunjeon/SeunjeonFile.java
@@ -31,7 +31,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.io.IOUtils;
+import org.codelibs.core.io.CloseableUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.dict.DictionaryException;
@@ -310,7 +310,7 @@ public class SeunjeonFile extends DictionaryFile<SeunjeonItem> {
             } catch (final IOException e) {
                 // ignore
             }
-            IOUtils.closeQuietly(writer);
+            CloseableUtil.closeQuietly(writer);
 
             if (isCommit) {
                 try {
diff --git a/src/main/java/org/codelibs/fess/dict/synonym/SynonymFile.java b/src/main/java/org/codelibs/fess/dict/synonym/SynonymFile.java
index fe79c58b3..6fe4dabe6 100644
--- a/src/main/java/org/codelibs/fess/dict/synonym/SynonymFile.java
+++ b/src/main/java/org/codelibs/fess/dict/synonym/SynonymFile.java
@@ -31,7 +31,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.io.IOUtils;
+import org.codelibs.core.io.CloseableUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.dict.DictionaryException;
@@ -348,7 +348,7 @@ public class SynonymFile extends DictionaryFile<SynonymItem> {
             } catch (final IOException e) {
                 // ignore
             }
-            IOUtils.closeQuietly(writer);
+            CloseableUtil.closeQuietly(writer);
 
             if (isCommit) {
                 try {
diff --git a/src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java b/src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java
index 5995aea50..cd00a2b8f 100644
--- a/src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java
+++ b/src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java
@@ -29,8 +29,8 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.text.StringEscapeUtils;
+import org.codelibs.core.io.CloseableUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.service.FailureUrlService;
@@ -288,7 +288,7 @@ public class CsvDataStoreImpl extends AbstractDataStoreImpl {
         } catch (final Exception e) {
             throw new DataStoreException("Failed to crawl data when reading csv file.", e);
         } finally {
-            IOUtils.closeQuietly(csvReader);
+            CloseableUtil.closeQuietly(csvReader);
         }
     }
 
diff --git a/src/main/java/org/codelibs/fess/helper/ProcessHelper.java b/src/main/java/org/codelibs/fess/helper/ProcessHelper.java
index 6a8ed2300..19e5b33fa 100644
--- a/src/main/java/org/codelibs/fess/helper/ProcessHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/ProcessHelper.java
@@ -27,6 +27,7 @@ import java.util.function.Consumer;
 import javax.annotation.PreDestroy;
 
 import org.apache.commons.io.IOUtils;
+import org.codelibs.core.io.CloseableUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.exception.JobNotFoundException;
 import org.codelibs.fess.exception.JobProcessingException;
@@ -97,7 +98,7 @@ public class ProcessHelper {
             final Process process = jobProcess.getProcess();
             new Thread(() -> {
                 try {
-                    IOUtils.closeQuietly(process.getInputStream());
+                    CloseableUtil.closeQuietly(process.getInputStream());
                 } catch (final Exception e) {
                     logger.warn("Could not close a process input stream.", e);
                 } finally {
@@ -106,7 +107,7 @@ public class ProcessHelper {
             }, "ProcessCloser-input-" + sessionId).start();
             new Thread(() -> {
                 try {
-                    IOUtils.closeQuietly(process.getErrorStream());
+                    CloseableUtil.closeQuietly(process.getErrorStream());
                 } catch (final Exception e) {
                     logger.warn("Could not close a process error stream.", e);
                 } finally {
@@ -115,7 +116,7 @@ public class ProcessHelper {
             }, "ProcessCloser-error-" + sessionId).start();
             new Thread(() -> {
                 try {
-                    IOUtils.closeQuietly(process.getOutputStream());
+                    CloseableUtil.closeQuietly(process.getOutputStream());
                 } catch (final Exception e) {
                     logger.warn("Could not close a process output stream.", e);
                 } finally {
diff --git a/src/main/java/org/codelibs/fess/helper/ViewHelper.java b/src/main/java/org/codelibs/fess/helper/ViewHelper.java
index 9ca7ba1ca..15d1e0be3 100644
--- a/src/main/java/org/codelibs/fess/helper/ViewHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/ViewHelper.java
@@ -41,10 +41,10 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.catalina.connector.ClientAbortException;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringEscapeUtils;
 import org.codelibs.core.CoreLibConstants;
+import org.codelibs.core.io.CloseableUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.misc.DynamicProperties;
 import org.codelibs.fess.Constants;
@@ -535,7 +535,7 @@ public class ViewHelper {
         final ResponseData responseData = client.execute(RequestDataBuilder.newRequestData().get().url(url).build());
         if (responseData.getHttpStatusCode() == 404) {
             response.httpStatus(responseData.getHttpStatusCode());
-            IOUtils.closeQuietly(responseData);
+            CloseableUtil.closeQuietly(responseData);
             return response;
         }
         writeFileName(response, responseData);
@@ -549,7 +549,7 @@ public class ViewHelper {
                     throw new FessSystemException("Failed to write a content. configId: " + configId + ", url: " + url, e);
                 }
             } finally {
-                IOUtils.closeQuietly(responseData);
+                CloseableUtil.closeQuietly(responseData);
             }
             if (logger.isDebugEnabled()) {
                 logger.debug("Finished to write " + url);
diff --git a/src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java b/src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java
index a5d30695b..eb0581b60 100644
--- a/src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java
+++ b/src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java
@@ -28,7 +28,7 @@ import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import javax.servlet.ServletContext;
 
-import org.apache.commons.io.IOUtils;
+import org.codelibs.core.io.CloseableUtil;
 import org.codelibs.core.io.CopyUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.slf4j.Logger;
@@ -155,7 +155,7 @@ public class CommandGenerator extends BaseThumbnailGenerator {
                         }
                     }
                 } finally {
-                    IOUtils.closeQuietly(br);
+                    CloseableUtil.closeQuietly(br);
                 }
 
                 p.waitFor();