Skip to content

Commit d74e6eb

Browse files
committed
feat: 同步 feature/3.0.x 首实现(Jackson 2 / JDK 17 适配)——pom 切换 com.fasterxml jackson-bom 2.22.1 与 Maven 3 模型,源码零改动(JDK8 兼容风格一次写好)
1 parent f77e2b6 commit d74e6eb

7 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ permissions:
2121

2222
jobs:
2323
build:
24-
name: JDK 21 Build & Verify
24+
name: JDK 17 Build & Verify
2525
runs-on: ubuntu-latest
2626
timeout-minutes: 30
2727
steps:
@@ -32,11 +32,11 @@ jobs:
3232
uses: actions/setup-java@v5
3333
with:
3434
distribution: temurin
35-
java-version: '21'
35+
java-version: '17'
3636
cache: maven
3737

3838
- name: Build and verify with JaCoCo coverage gate
39-
run: ./mvnw -B --no-transfer-progress clean verify
39+
run: mvn -B --no-transfer-progress clean verify
4040

4141
- name: Upload JaCoCo coverage report
4242
if: always()

‎pom.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xmlns="http://maven.apache.org/POM/4.1.0"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
5-
<modelVersion>4.1.0</modelVersion>
3+
xmlns="http://maven.apache.org/POM/4.0.0"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
66
<groupId>io.github.easy4j</groupId>
77
<artifactId>kimi-java-sdk</artifactId>
88
<name>${project.groupId}:${project.artifactId}</name>
99
<url>https://github.com/easy-4-java/${project.artifactId}</url>
1010
<description>Kimi Code CLI Java SDK — subprocess, ACP stdio and web-server integration for the Kimi agent</description>
11-
<version>3.0.x.20260630-SNAPSHOT</version>
11+
<version>2.0.x.20260630-SNAPSHOT</version>
1212
<packaging>jar</packaging>
1313
<licenses>
1414
<license>
@@ -35,14 +35,14 @@
3535
</developers>
3636
<properties>
3737
<!-- ═══ 第一段: 基础属性(自然排序)═══ -->
38-
<java.version>21</java.version>
38+
<java.version>17</java.version>
3939
<maven.compiler.release>${java.version}</maven.compiler.release>
4040
<maven.version>4.0.0-rc-5</maven.version>
4141
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4242
<!-- Dependency versions -->
4343
<commons-exec.version>1.6.0</commons-exec.version>
44-
<jackson.version>3.2.1</jackson.version>
45-
<jackson-bom.version>3.2.1</jackson-bom.version>
44+
<jackson.version>2.22.1</jackson.version>
45+
<jackson-bom.version>2.22.1</jackson-bom.version>
4646
<junit-jupiter.version>6.1.0</junit-jupiter.version>
4747
<junit.version>5.11.4</junit.version>
4848
<lombok.version>1.18.46</lombok.version>
@@ -69,7 +69,7 @@
6969
<dependencies>
7070
<!-- Jackson BOM -->
7171
<dependency>
72-
<groupId>tools.jackson</groupId>
72+
<groupId>com.fasterxml.jackson</groupId>
7373
<artifactId>jackson-bom</artifactId>
7474
<version>${jackson-bom.version}</version>
7575
<type>pom</type>
@@ -101,7 +101,7 @@
101101
</dependencyManagement>
102102
<dependencies>
103103
<dependency>
104-
<groupId>tools.jackson.core</groupId>
104+
<groupId>com.fasterxml.jackson.core</groupId>
105105
<artifactId>jackson-databind</artifactId>
106106
</dependency>
107107
<dependency>
@@ -166,7 +166,7 @@
166166
<rules>
167167
<requireMavenVersion>
168168
<message><![CDATA[You are running an older version of Maven. This application requires at least Maven 4.]]></message>
169-
<version>[4.0.0,)</version>
169+
<version>[3.6.3,)</version>
170170
</requireMavenVersion>
171171
<requireJavaVersion>
172172
<message>

‎src/main/java/io/github/easy4j/kimi/KimiClient.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import io.github.easy4j.kimi.cli.KimiCliExecutor;
2727
import io.github.easy4j.kimi.cli.KimiCliResult;
2828
import io.github.easy4j.kimi.model.KimiEvent;
29-
import tools.jackson.databind.DeserializationFeature;
30-
import tools.jackson.databind.ObjectMapper;
31-
import tools.jackson.databind.json.JsonMapper;
29+
import com.fasterxml.jackson.databind.DeserializationFeature;
30+
import com.fasterxml.jackson.databind.ObjectMapper;
31+
import com.fasterxml.jackson.databind.json.JsonMapper;
3232

3333
/**
3434
* High-level Java facade that wraps every local {@code kimi} CLI invocation

‎src/main/java/io/github/easy4j/kimi/acp/KimiAcpClient.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
import org.slf4j.LoggerFactory;
4141

4242
import io.github.easy4j.kimi.KimiException;
43-
import tools.jackson.databind.JsonNode;
44-
import tools.jackson.databind.ObjectMapper;
45-
import tools.jackson.databind.json.JsonMapper;
43+
import com.fasterxml.jackson.databind.JsonNode;
44+
import com.fasterxml.jackson.databind.ObjectMapper;
45+
import com.fasterxml.jackson.databind.json.JsonMapper;
4646

4747
/**
4848
* Client for the Kimi ACP route: spawns {@code kimi acp} as a child process
@@ -73,7 +73,7 @@ public class KimiAcpClient implements AutoCloseable {
7373

7474
private final KimiAcpConfig config;
7575
private final ObjectMapper mapper =
76-
JsonMapper.builder().disable(tools.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
76+
JsonMapper.builder().disable(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
7777
.build();
7878
private final Map<Long, CompletableFuture<JsonNode>> pendingRpcs = new ConcurrentHashMap<Long, CompletableFuture<JsonNode>>();
7979
private final Map<String, PromptStream> promptStreams = new ConcurrentHashMap<String, PromptStream>();

‎src/main/java/io/github/easy4j/kimi/server/KimiServerClient.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
import org.slf4j.LoggerFactory;
3737

3838
import io.github.easy4j.kimi.KimiException;
39-
import tools.jackson.databind.JsonNode;
40-
import tools.jackson.databind.ObjectMapper;
41-
import tools.jackson.databind.json.JsonMapper;
39+
import com.fasterxml.jackson.databind.JsonNode;
40+
import com.fasterxml.jackson.databind.ObjectMapper;
41+
import com.fasterxml.jackson.databind.json.JsonMapper;
4242

4343
/**
4444
* Client for the Kimi web-server route ({@code kimi web}).
@@ -72,7 +72,7 @@ public class KimiServerClient implements AutoCloseable {
7272

7373
private static final Logger log = LoggerFactory.getLogger(KimiServerClient.class);
7474
private static final ObjectMapper MAPPER =
75-
JsonMapper.builder().disable(tools.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
75+
JsonMapper.builder().disable(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
7676
.build();
7777

7878
private final KimiServerConfig config;

‎src/test/java/io/github/easy4j/kimi/model/KimiEventTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
import org.junit.jupiter.api.Test;
2424

25-
import tools.jackson.databind.ObjectMapper;
26-
import tools.jackson.databind.json.JsonMapper;
25+
import com.fasterxml.jackson.databind.ObjectMapper;
26+
import com.fasterxml.jackson.databind.json.JsonMapper;
2727

2828
/**
2929
* Unit tests for {@link KimiEvent}: JSON round-trips and tolerance of

‎src/test/java/io/github/easy4j/kimi/server/KimiServerClientTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import com.sun.net.httpserver.HttpServer;
3232

3333
import io.github.easy4j.kimi.KimiException;
34-
import tools.jackson.databind.JsonNode;
35-
import tools.jackson.databind.json.JsonMapper;
34+
import com.fasterxml.jackson.databind.JsonNode;
35+
import com.fasterxml.jackson.databind.json.JsonMapper;
3636

3737
/**
3838
* Unit tests for {@link KimiServerClient} against an in-process

0 commit comments

Comments
 (0)