Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ISSUE #4814] Migrate from fastjson 1.2.83 to fastjson2 #4819

Merged
merged 3 commits into from
Apr 10, 2024
Merged

[ISSUE #4814] Migrate from fastjson 1.2.83 to fastjson2 #4819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49cf4cc
[Enhancement] Migrate from fastjson 1.2.83 to fastjson2 #4814
cnzakii Apr 8, 2024
386c25d
fix_dependencies_problem
cnzakii Apr 9, 2024
37d0002
fix_check
cnzakii Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,6 @@ subprojects {
dependency "org.projectlombok:lombok:1.18.22"
dependency "com.github.seancfoley:ipaddress:5.3.3"
dependency "javax.annotation:javax.annotation-api:1.3.2"
dependency "com.alibaba:fastjson:1.2.83" // TODO migrate to fastjson2
dependency "com.alibaba.fastjson2:fastjson2:2.0.48"

dependency "software.amazon.awssdk:s3:2.20.29"
Expand Down
2 changes: 1 addition & 1 deletion eventmesh-connectors/eventmesh-connector-prometheus/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
implementation project(":eventmesh-openconnect:eventmesh-openconnect-java")
implementation 'org.apache.httpcomponents:httpclient'
implementation 'com.github.rholder:guava-retrying'
implementation 'com.alibaba:fastjson'
implementation 'com.alibaba.fastjson2:fastjson2'
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
}
4 changes: 2 additions & 2 deletions ...org/apache/eventmesh/connector/prometheus/source/connector/PrometheusSourceConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.github.rholder.retry.Attempt;
import com.github.rholder.retry.RetryListener;
import com.github.rholder.retry.Retryer;
Expand Down
2 changes: 1 addition & 1 deletion eventmesh-connectors/eventmesh-connector-wechat/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dependencies {
implementation project(":eventmesh-sdks:eventmesh-sdk-java")
implementation project(":eventmesh-openconnect:eventmesh-openconnect-java")

implementation 'com.alibaba:fastjson'
implementation 'com.alibaba.fastjson2:fastjson2'
implementation 'com.google.guava:guava'
implementation 'com.squareup.okhttp3:okhttp'

Expand Down
4 changes: 2 additions & 2 deletions ...c/main/java/org/apache/eventmesh/connector/wechat/sink/connector/WeChatSinkConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
import java.util.Objects;
import java.util.concurrent.TimeUnit;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;

Expand Down
2 changes: 1 addition & 1 deletion eventmesh-runtime/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies {
implementation "org.apache.httpcomponents:httpclient"
implementation 'io.netty:netty-all'

implementation "com.alibaba:fastjson"
implementation "com.alibaba.fastjson2:fastjson2"

implementation 'com.github.seancfoley:ipaddress'

Expand Down
2 changes: 1 addition & 1 deletion tools/dependency-check/known-dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ endpoints-spi-2.20.29.jar
error_prone_annotations-2.9.0.jar
eventstream-1.0.1.jar
failureaccess-1.0.1.jar
fastjson-1.2.83.jar
fastjson-1.2.69_noneautotype.jar
fastjson2-2.0.48.jar
gateway-dingtalk-1.0.2.jar
google-auth-library-credentials-0.22.2.jar
Expand Down
2 changes: 1 addition & 1 deletion tools/third-party-licenses/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
error_prone_annotations 2.7.1: https://github.com/google/error-prone, Apache 2.0
failureaccess 1.0.1: https://github.com/google/guava, Apache 2.0
listenablefuture 9999.0-empty-to-avoid-conflict-with-guava: https://github.com/google/guava, Apache 2.0
fastjson 1.2.83: https://github.com/alibaba/fastjson, Apache 2.0
fastjson2 2.0.48: https://github.com/alibaba/fastjson2, Apache 2.0
guava 31.0.1-jre: https://github.com/google/guava, Apache 2.0
gateway-dingtalk 1.0.2: https://github.com/aliyun/alibabacloud-gateway, Apache 2.0
guice 4.2.2: https://github.com/google/guice, Apache 2.0
Expand Down
Loading