Skip to content

Commit a375f50

Browse files
committed
feat: migrate to Jackson 3.x (tools.jackson 3.2.1) per easy4j-deploy spec
1 parent fbba6c5 commit a375f50

15 files changed

Lines changed: 41 additions & 45 deletions

File tree

‎pom.xml‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<!-- Dependency versions -->
6262
<commons-exec.version>1.6.0</commons-exec.version>
6363
<commons-lang.version>2.6</commons-lang.version>
64-
<jackson.version>2.17.2</jackson.version>
64+
<jackson-bom.version>3.2.1</jackson-bom.version>
6565
<java-websocket.version>1.6.0</java-websocket.version>
6666
<junit-jupiter.version>6.1.0</junit-jupiter.version>
6767
<junit.version>4.13.2</junit.version>
@@ -93,9 +93,9 @@
9393
<dependencies>
9494
<!-- For Jackson BOM -->
9595
<dependency>
96-
<groupId>com.fasterxml.jackson</groupId>
96+
<groupId>tools.jackson</groupId>
9797
<artifactId>jackson-bom</artifactId>
98-
<version>2.21.5</version>
98+
<version>${jackson-bom.version}</version>
9999
<type>pom</type>
100100
<scope>import</scope>
101101
</dependency>
@@ -141,19 +141,14 @@
141141
<artifactId>junit-jupiter</artifactId>
142142
<version>${junit-jupiter.version}</version>
143143
</dependency>
144-
<!-- For Jackson -->
145-
<dependency>
146-
<groupId>com.fasterxml.jackson.core</groupId>
147-
<artifactId>jackson-databind</artifactId>
148-
<version>2.22.0</version></dependency>
149144
</dependencies>
150145
</dependencyManagement>
151146

152147
<!-- 项目依赖(dependencies) -->
153148
<dependencies>
154149
<!-- For Jackson -->
155150
<dependency>
156-
<groupId>com.fasterxml.jackson.core</groupId>
151+
<groupId>tools.jackson.core</groupId>
157152
<artifactId>jackson-databind</artifactId>
158153
</dependency>
159154
<!-- For Commons Exec -->

‎src/main/java/io/github/easy4j/opencli/adapter/browser/chatgpt/ChatgptOpenCliClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.easy4j.opencli.adapter.browser.chatgpt;
22

33
import io.github.easy4j.opencli.util.OpenCliLists;
4-
import com.fasterxml.jackson.databind.JsonNode;
4+
import tools.jackson.databind.JsonNode;
55
import io.github.easy4j.opencli.core.OpenCliAdapterChannel;
66
import io.github.easy4j.opencli.core.OpenCliArgSupport;
77
import io.github.easy4j.opencli.core.OpenCliExecutor;

‎src/main/java/io/github/easy4j/opencli/adapter/browser/claude/ClaudeOpenCliClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import io.github.easy4j.opencli.util.OpenCliLists;
44
import io.github.easy4j.opencli.adapter.browser.support.BrowserLlmOptions;
5-
import com.fasterxml.jackson.databind.JsonNode;
5+
import tools.jackson.databind.JsonNode;
66
import io.github.easy4j.opencli.core.OpenCliAdapterChannel;
77
import io.github.easy4j.opencli.core.OpenCliArgSupport;
88
import io.github.easy4j.opencli.core.OpenCliExecutor;

‎src/main/java/io/github/easy4j/opencli/adapter/browser/deepseek/DeepseekOpenCliClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.easy4j.opencli.adapter.browser.deepseek;
22

3-
import com.fasterxml.jackson.databind.JsonNode;
3+
import tools.jackson.databind.JsonNode;
44
import io.github.easy4j.opencli.core.OpenCliAdapterChannel;
55
import io.github.easy4j.opencli.core.OpenCliArgSupport;
66
import io.github.easy4j.opencli.core.OpenCliExecutor;

‎src/main/java/io/github/easy4j/opencli/adapter/publicapi/arxiv/ArxivOpenCliClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.easy4j.opencli.adapter.publicapi.arxiv;
22

3-
import com.fasterxml.jackson.databind.JsonNode;
3+
import tools.jackson.databind.JsonNode;
44
import io.github.easy4j.opencli.core.OpenCliAdapterChannel;
55
import io.github.easy4j.opencli.core.OpenCliArgSupport;
66
import io.github.easy4j.opencli.core.OpenCliExecutor;

‎src/main/java/io/github/easy4j/opencli/adapter/publicapi/binance/BinanceOpenCliClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.easy4j.opencli.adapter.publicapi.binance;
22

33
import io.github.easy4j.opencli.util.OpenCliLists;
4-
import com.fasterxml.jackson.databind.JsonNode;
4+
import tools.jackson.databind.JsonNode;
55
import io.github.easy4j.opencli.core.OpenCliAdapterChannel;
66
import io.github.easy4j.opencli.core.OpenCliArgSupport;
77
import io.github.easy4j.opencli.core.OpenCliExecutor;

‎src/main/java/io/github/easy4j/opencli/adapter/publicapi/npm/NpmOpenCliClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.easy4j.opencli.adapter.publicapi.npm;
22

3-
import com.fasterxml.jackson.databind.JsonNode;
3+
import tools.jackson.databind.JsonNode;
44
import io.github.easy4j.opencli.core.OpenCliAdapterChannel;
55
import io.github.easy4j.opencli.core.OpenCliArgSupport;
66
import io.github.easy4j.opencli.core.OpenCliExecutor;

‎src/main/java/io/github/easy4j/opencli/adapter/publicapi/pypi/PypiOpenCliClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.easy4j.opencli.adapter.publicapi.pypi;
22

3-
import com.fasterxml.jackson.databind.JsonNode;
3+
import tools.jackson.databind.JsonNode;
44
import io.github.easy4j.opencli.core.OpenCliAdapterChannel;
55
import io.github.easy4j.opencli.core.OpenCliArgSupport;
66
import io.github.easy4j.opencli.core.OpenCliExecutor;

‎src/main/java/io/github/easy4j/opencli/adapter/publicapi/wikipedia/WikipediaOpenCliClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.easy4j.opencli.adapter.publicapi.wikipedia;
22

33
import io.github.easy4j.opencli.util.OpenCliLists;
4-
import com.fasterxml.jackson.databind.JsonNode;
4+
import tools.jackson.databind.JsonNode;
55
import io.github.easy4j.opencli.core.OpenCliAdapterChannel;
66
import io.github.easy4j.opencli.core.OpenCliArgSupport;
77
import io.github.easy4j.opencli.core.OpenCliExecutor;

‎src/main/java/io/github/easy4j/opencli/center/ws/OpenCliWsCollectStdoutItems.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package io.github.easy4j.opencli.center.ws;
22

3-
import com.fasterxml.jackson.databind.JsonNode;
4-
import com.fasterxml.jackson.databind.ObjectMapper;
5-
import com.fasterxml.jackson.databind.node.ObjectNode;
3+
import tools.jackson.databind.DeserializationFeature;
4+
import tools.jackson.databind.JsonNode;
5+
import tools.jackson.databind.node.ObjectNode;
6+
import tools.jackson.databind.json.JsonMapper;
67
import io.github.easy4j.opencli.util.OpenCliStrings;
78
import java.util.ArrayList;
89
import java.util.Collections;
@@ -16,7 +17,10 @@
1617
* @since 3.0.0
1718
*/public final class OpenCliWsCollectStdoutItems {
1819

19-
private static final ObjectMapper MAPPER = new ObjectMapper();
20+
/** 与 Jackson 2.x 行为保持一致:容忍尾随内容(stdout 中 JSON 后可能带额外文本)。 */
21+
private static final JsonMapper MAPPER = JsonMapper.builder()
22+
.disable(DeserializationFeature.FAIL_ON_TRAILING_TOKENS)
23+
.build();
2024

2125
private OpenCliWsCollectStdoutItems() {
2226
}

0 commit comments

Comments
 (0)