diff --git a/codegen-web/pom.xml b/codegen-web/pom.xml
index b1d77d78d..019c5a7e3 100644
--- a/codegen-web/pom.xml
+++ b/codegen-web/pom.xml
@@ -155,6 +155,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>3.1.1</version>
                 <configuration>
                     <archive>
                         <manifest>
diff --git a/codegen-web/src/main/java/com/networknt/codegen/handler/ValidateUploadFileHandler.java b/codegen-web/src/main/java/com/networknt/codegen/handler/ValidateUploadFileHandler.java
index fb480906b..df230265b 100644
--- a/codegen-web/src/main/java/com/networknt/codegen/handler/ValidateUploadFileHandler.java
+++ b/codegen-web/src/main/java/com/networknt/codegen/handler/ValidateUploadFileHandler.java
@@ -18,6 +18,7 @@
  * @author Nicholas Azar
  * Created on July 8, 2017.
  */
+@Deprecated
 @ServiceHandler(id="lightapi.net/codegen/validateUploadFile/0.0.1")
 public class ValidateUploadFileHandler implements Handler {
     static private final Logger logger = LoggerFactory.getLogger(ValidateUploadFileHandler.class);
diff --git a/light-eventuate-4j/src/main/java/com/networknt/codegen/eventuate/EventuateHybridServiceGenerator.java b/light-eventuate-4j/src/main/java/com/networknt/codegen/eventuate/EventuateHybridServiceGenerator.java
index cf8ee49e3..0e069c9c3 100644
--- a/light-eventuate-4j/src/main/java/com/networknt/codegen/eventuate/EventuateHybridServiceGenerator.java
+++ b/light-eventuate-4j/src/main/java/com/networknt/codegen/eventuate/EventuateHybridServiceGenerator.java
@@ -4,7 +4,7 @@
 import com.jsoniter.any.Any;
 import com.jsoniter.output.JsonStream;
 import com.networknt.codegen.Generator;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
diff --git a/light-hybrid-4j/src/main/java/com/networknt/codegen/hybrid/HybridServiceGenerator.java b/light-hybrid-4j/src/main/java/com/networknt/codegen/hybrid/HybridServiceGenerator.java
index b3823606c..5646dd408 100644
--- a/light-hybrid-4j/src/main/java/com/networknt/codegen/hybrid/HybridServiceGenerator.java
+++ b/light-hybrid-4j/src/main/java/com/networknt/codegen/hybrid/HybridServiceGenerator.java
@@ -1,12 +1,10 @@
 package com.networknt.codegen.hybrid;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jsoniter.ValueType;
 import com.jsoniter.any.Any;
 import com.jsoniter.output.JsonStream;
 import com.networknt.codegen.Generator;
-import com.networknt.utility.NioUtils;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
diff --git a/light-rest-4j/src/main/java/com/networknt/codegen/rest/YAMLFileParameterizer.java b/light-rest-4j/src/main/java/com/networknt/codegen/rest/YAMLFileParameterizer.java
index f239de75a..cbb7f4cf6 100644
--- a/light-rest-4j/src/main/java/com/networknt/codegen/rest/YAMLFileParameterizer.java
+++ b/light-rest-4j/src/main/java/com/networknt/codegen/rest/YAMLFileParameterizer.java
@@ -1,16 +1,10 @@
 package com.networknt.codegen.rest;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -40,6 +34,8 @@
 
 import com.jsoniter.any.Any;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 public class YAMLFileParameterizer {
 	private static final Logger logger = LoggerFactory.getLogger(YAMLFileParameterizer.class);
 	private static final String KEY_SEPARATOR = ".";
@@ -347,7 +343,7 @@ protected static List<String> listClasspathDir(String dir) {
 	
 	protected static Node loadResource(String resourceLocation) {
 		try (InputStream in = getResourceAsStream(resourceLocation);
-				BufferedReader inputReader = new BufferedReader(new InputStreamReader(in))) {
+				BufferedReader inputReader = new BufferedReader(new InputStreamReader(in, UTF_8))) {
 			Composer composer = new Composer(new ParserImpl(new StreamReader(inputReader)), new Resolver());
 			return composer.getSingleNode();
 		} catch (Exception e) {
@@ -361,7 +357,7 @@ protected static List<String> readResource(String resourceLocation) {
 		List<String> lines = new ArrayList<>();
 		
 		try (InputStream in = getResourceAsStream(resourceLocation);
-				InputStreamReader reader = new InputStreamReader(in, StandardCharsets.UTF_8)) {
+				InputStreamReader reader = new InputStreamReader(in, UTF_8)) {
 			lines.addAll(IOUtils.readLines(reader));
 			lines.add(StringUtils.EMPTY); // because trailing empty lines are ignored.
 		} catch (Exception e) {
@@ -372,7 +368,7 @@ protected static List<String> readResource(String resourceLocation) {
 	}
 	
 	protected static Node loadFile(File file) {
-		try (FileReader inputReader = new FileReader(file)) {
+		try (Reader inputReader = Files.newBufferedReader(file.toPath(), UTF_8)) {
 			Composer composer = new Composer(new ParserImpl(new StreamReader(inputReader)), new Resolver());
 			return composer.getSingleNode();
 		} catch (Exception e) {
@@ -396,7 +392,7 @@ protected static List<String> readFile(File file) {
 	}
 	
 	protected static void parameterize(String filename, Node document, List<String> srclines, File destFile, Map<String, Any> generateEnvVars) {
-		try (FileWriter writer = new FileWriter(destFile)) {
+		try (Writer writer = Files.newBufferedWriter(destFile.toPath(), UTF_8)) {
 			if (document instanceof MappingNode) {
 				List<String> destlines = parameterize(filename, srclines, (MappingNode) document, generateEnvVars);