azkaban-aplcache

diff --git a/azkaban-exec-server/build.gradle b/azkaban-exec-server/build.gradle
index 083e376..353df7f 100644
--- a/azkaban-exec-server/build.gradle
+++ b/azkaban-exec-server/build.gradle
@@ -4,9 +4,7 @@ dependencies {
     compile(project(':azkaban-common'))
 
     compile deps.kafkaLog4jAppender
-    compile(deps.jsonSimple) {
-        exclude group: 'junit', module: 'junit'
-    }
+    compile(deps.gson)
 
     runtime(project(':azkaban-hadoop-security-plugin'))
 

diff --git a/azkaban-exec-server/src/main/java/azkaban/execapp/LogUtil.java b/azkaban-exec-server/src/main/java/azkaban/execapp/LogUtil.java
index 7411806..d6631ee 100644
--- a/azkaban-exec-server/src/main/java/azkaban/execapp/LogUtil.java
+++ b/azkaban-exec-server/src/main/java/azkaban/execapp/LogUtil.java
@@ -18,12 +18,14 @@ package azkaban.execapp;
 
 import azkaban.Constants;
 import azkaban.utils.Props;
-import org.json.simple.JSONObject;
+import com.google.gson.Gson;
+import java.util.HashMap;
+import java.util.Map;
 
 class LogUtil {
 
-  static String createLogPatternLayoutJsonString(Props props, String jobId) {
-    final JSONObject layout = new JSONObject();
+  static String createLogPatternLayoutJsonString(final Props props, final String jobId) {
+    final Map<String, String> layout = new HashMap<>();
     layout.put("category", "%c{1}");
     layout.put("level", "%p");
     layout.put("message", "%m");
@@ -37,6 +39,9 @@ class LogUtil {
     layout.put("projectversion",
         props.getString(Constants.FlowProperties.AZKABAN_FLOW_PROJECT_VERSION));
     layout.put("logsource", "userJob");
-    return layout.toString();
+
+    final Gson gson = new Gson();
+
+    return gson.toJson(layout);
   }
 }

diff --git a/build.gradle b/build.gradle
index fef530f..023f5ce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,6 +42,7 @@ ext.deps = [
         dbcp2               : 'org.apache.commons:commons-dbcp2:2.1.1',
         dbutils             : 'commons-dbutils:commons-dbutils:1.5',
         fileupload          : 'commons-fileupload:commons-fileupload:1.2.1',
+        gson                : 'com.google.code.gson:gson:2.8.1',
         guava               : 'com.google.guava:guava:21.0',
         guice               : 'com.google.inject:guice:4.1.0',
         h2                  : 'com.h2database:h2:1.4.193',
@@ -62,7 +63,6 @@ ext.deps = [
         jexl                : 'org.apache.commons:commons-jexl:2.1.1',
         jodaTime            : 'joda-time:joda-time:2.0',
         jopt                : 'net.sf.jopt-simple:jopt-simple:4.3',
-        jsonSimple          : 'com.googlecode.json-simple:json-simple:1.1.1',
         junit               : 'junit:junit:4.12',
         kafkaLog4jAppender  : 'org.apache.kafka:kafka-log4j-appender:0.10.0.0',
         log4j               : 'log4j:log4j:1.2.16',