#1749 remove json-simple dependency (#2091)

pinpoint-apm · Sep 12, 2016 · d7b78f5 · d7b78f5
1 parent 921ed6f
commit d7b78f5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -341,12 +341,6 @@
                 <version>${fastxml.jackson.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.googlecode.json-simple</groupId>
-                <artifactId>json-simple</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.hbase</groupId>
                 <artifactId>hbase-client</artifactId>
@@ -651,7 +645,7 @@
             <dependency>
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
-                <version>3.4.5-cdh5.7.0</version>
+                <version>3.4.5-cdh5.7.3</version>
             </dependency>
 
             <!-- for zookeeper test -->

diff --git a/web/pom.xml b/web/pom.xml
@@ -260,11 +260,6 @@
             <scope>runtime</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.googlecode.json-simple</groupId>
-            <artifactId>json-simple</artifactId>
-        </dependency>
-
         <!-- for sms platform dependencies -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

diff --git a/web/src/main/java/com/navercorp/pinpoint/web/view/TransactionInfoViewModel.java b/web/src/main/java/com/navercorp/pinpoint/web/view/TransactionInfoViewModel.java
@@ -23,7 +23,6 @@
 
 import com.navercorp.pinpoint.common.util.TransactionId;
 import com.navercorp.pinpoint.common.util.TransactionIdUtils;
-import org.json.simple.JSONObject;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -32,6 +31,7 @@
 import com.navercorp.pinpoint.web.applicationmap.Node;
 import com.navercorp.pinpoint.web.vo.callstacks.Record;
 import com.navercorp.pinpoint.web.vo.callstacks.RecordSet;
+import org.apache.commons.lang3.StringEscapeUtils;
 
 /**
  * @author jaehong.kim
@@ -243,8 +243,8 @@ public CallStack(final Record record, long barRatio) {
             }
             isMethod = record.isMethod();
             hasChild = record.getHasChild();
-            title = JSONObject.escape(record.getTitle());
-            //arguments = JSONObject.escape(StringEscapeUtils.escapeHtml4(record.getArguments()));
+            title = StringEscapeUtils.escapeJson(record.getTitle());
+            //arguments = StringEscapeUtils.escapeJson(StringEscapeUtils.escapeHtml4(record.getArguments()));
             arguments = record.getArguments();
             if (record.isMethod()) {
                 executeTime = DateUtils.longToDateStr(record.getBegin(), "HH:mm:ss SSS"); // time format