Skip to content

Commit 225bf56

Browse files
author
‘niuerzhuang’
committed
fix:
upgrade to fastjson2.
1 parent d5fae5f commit 225bf56

File tree

24 files changed

+37
-51
lines changed

24 files changed

+37
-51
lines changed

‎dongtai-agent/module-info.java‎

Whitespace-only changes.

‎dongtai-agent/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@
8585
<version>${gson.version}</version>
8686
</dependency>
8787
<dependency>
88-
<groupId>com.alibaba</groupId>
89-
<artifactId>fastjson</artifactId>
90-
<version>${fastjson.version}</version>
88+
<groupId>com.alibaba.fastjson2</groupId>
89+
<artifactId>fastjson2</artifactId>
90+
<version>${fastjson2.version}</version>
9191
</dependency>
9292
</dependencies>
9393

‎dongtai-agent/src/main/java/io/dongtai/iast/agent/fallback/FallbackConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.dongtai.iast.agent.fallback;
22

3-
import com.alibaba.fastjson.JSONObject;
3+
import com.alibaba.fastjson2.JSONObject;
44
import com.google.gson.reflect.TypeToken;
55
import io.dongtai.iast.agent.IastProperties;
66
import io.dongtai.iast.agent.fallback.entity.*;

‎dongtai-agent/src/main/java/io/dongtai/iast/agent/monitor/impl/AgentStateMonitor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.dongtai.iast.agent.monitor.impl;
22

3-
import com.alibaba.fastjson.JSON;
4-
import com.alibaba.fastjson.JSONObject;
3+
import com.alibaba.fastjson2.JSON;
4+
import com.alibaba.fastjson2.JSONObject;
55
import io.dongtai.iast.agent.manager.EngineManager;
66
import io.dongtai.iast.agent.monitor.IMonitor;
77
import io.dongtai.iast.agent.monitor.MonitorDaemonThread;

‎dongtai-agent/src/main/java/io/dongtai/iast/agent/report/AgentRegisterReport.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.dongtai.iast.agent.report;
22

3-
import com.alibaba.fastjson.JSON;
4-
import com.alibaba.fastjson.JSONArray;
5-
import com.alibaba.fastjson.JSONObject;
3+
import com.alibaba.fastjson2.JSON;
4+
import com.alibaba.fastjson2.JSONArray;
5+
import com.alibaba.fastjson2.JSONObject;
66
import io.dongtai.iast.agent.IastProperties;
77
import io.dongtai.iast.agent.manager.EngineManager;
88
import io.dongtai.iast.agent.middlewarerecognition.IServer;

‎dongtai-agent/src/main/java/io/dongtai/iast/agent/report/HeartBeatReport.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.dongtai.iast.agent.report;
22

3-
import com.alibaba.fastjson.JSONObject;
3+
import com.alibaba.fastjson2.JSONObject;
44
import io.dongtai.iast.agent.monitor.impl.PerformanceMonitor;
55
import io.dongtai.iast.agent.util.ByteUtils;
66
import io.dongtai.iast.common.constants.ReportKey;

‎dongtai-common/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
<version>${json.version}</version>
3434
</dependency>
3535
<dependency>
36-
<groupId>com.alibaba</groupId>
37-
<artifactId>fastjson</artifactId>
38-
<version>${fastjson.version}</version>
36+
<groupId>com.alibaba.fastjson2</groupId>
37+
<artifactId>fastjson2</artifactId>
38+
<version>${fastjson2.version}</version>
3939
</dependency>
4040

4141
<dependency>

‎dongtai-core/pom.xml‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,9 @@
203203
</dependency>
204204

205205
<dependency>
206-
<groupId>com.alibaba</groupId>
207-
<artifactId>fastjson</artifactId>
208-
<version>${fastjson.version}</version>
206+
<groupId>com.alibaba.fastjson2</groupId>
207+
<artifactId>fastjson2</artifactId>
208+
<version>${fastjson2.version}</version>
209209
</dependency>
210210

211211
<dependency>
@@ -260,21 +260,6 @@
260260
<version>${pkg.jdom.version}</version>
261261
<scope>test</scope>
262262
</dependency>
263-
<dependency>
264-
<groupId>javax.xml.bind</groupId>
265-
<artifactId>jaxb-api</artifactId>
266-
<version>2.3.0</version>
267-
</dependency>
268-
<dependency>
269-
<groupId>com.sun.xml.bind</groupId>
270-
<artifactId>jaxb-core</artifactId>
271-
<version>2.3.0.1</version>
272-
</dependency>
273-
<dependency>
274-
<groupId>com.sun.xml.bind</groupId>
275-
<artifactId>jaxb-impl</artifactId>
276-
<version>2.3.0.1</version>
277-
</dependency>
278263
<!-- xom dependency xalan will cause feature secure-processing failed
279264
<dependency>
280265
<groupId>xom</groupId>

‎dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/hardcoded/DispatchHardcodedPlugin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.dongtai.iast.core.bytecode.enhance.plugin.hardcoded;
22

3-
import com.alibaba.fastjson.JSONObject;
3+
import com.alibaba.fastjson2.JSONObject;
44
import io.dongtai.iast.common.constants.*;
55
import io.dongtai.iast.common.utils.base64.Base64Encoder;
66
import io.dongtai.iast.core.EngineManager;

‎dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/sca/ScaReport.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.dongtai.iast.core.bytecode.sca;
22

3-
import com.alibaba.fastjson.JSONObject;
3+
import com.alibaba.fastjson2.JSONObject;
44
import io.dongtai.iast.common.constants.*;
55
import io.dongtai.iast.core.EngineManager;
66
import io.dongtai.iast.core.utils.HttpClientUtils;

0 commit comments

Comments
 (0)