Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Add the dependency and start parsing JSON in seconds:
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
<version>2.0.61</version>
<version>2.0.63</version>
</dependency>
```

Expand All @@ -91,15 +91,15 @@ The `groupId` for FASTJSON 2 is `com.alibaba.fastjson2` (different from 1.x):
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
<version>2.0.61</version>
<version>2.0.63</version>
</dependency>
```

**Gradle:**

```groovy
dependencies {
implementation 'com.alibaba.fastjson2:fastjson2:2.0.61'
implementation 'com.alibaba.fastjson2:fastjson2:2.0.63'
}
```

Expand All @@ -115,15 +115,15 @@ If you are migrating from `fastjson 1.2.x`, you can use the compatibility packag
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>2.0.61</version>
<version>2.0.63</version>
</dependency>
```

**Gradle:**

```groovy
dependencies {
implementation 'com.alibaba:fastjson:2.0.61'
implementation 'com.alibaba:fastjson:2.0.63'
}
```

Expand All @@ -137,7 +137,7 @@ For projects using Kotlin, the `fastjson2-kotlin` module provides idiomatic Kotl
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-kotlin</artifactId>
<version>2.0.61</version>
<version>2.0.63</version>
</dependency>
```

Expand All @@ -161,7 +161,7 @@ Add the Kotlin standard library and reflection library as needed. The reflection

```kotlin
dependencies {
implementation("com.alibaba.fastjson2:fastjson2-kotlin:2.0.61")
implementation("com.alibaba.fastjson2:fastjson2-kotlin:2.0.63")
implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version")
implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlin_version")
}
Expand All @@ -177,7 +177,7 @@ For Spring Framework projects, use the appropriate extension module. See the ful
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-extension-spring5</artifactId>
<version>2.0.61</version>
<version>2.0.63</version>
</dependency>
```

Expand All @@ -187,7 +187,7 @@ For Spring Framework projects, use the appropriate extension module. See the ful
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-extension-spring6</artifactId>
<version>2.0.61</version>
<version>2.0.63</version>
</dependency>
```

Expand All @@ -196,9 +196,9 @@ For Spring Framework projects, use the appropriate extension module. See the ful
```groovy
dependencies {
// Choose one based on your Spring version:
implementation 'com.alibaba.fastjson2:fastjson2-extension-spring5:2.0.61'
implementation 'com.alibaba.fastjson2:fastjson2-extension-spring5:2.0.63'
// or
implementation 'com.alibaba.fastjson2:fastjson2-extension-spring6:2.0.61'
implementation 'com.alibaba.fastjson2:fastjson2-extension-spring6:2.0.63'
}
```

Expand Down
22 changes: 11 additions & 11 deletions README_cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
<version>2.0.61</version>
<version>2.0.63</version>
</dependency>
```

Expand All @@ -92,15 +92,15 @@ String json = JSON.toJSONString(user);
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
<version>2.0.61</version>
<version>2.0.63</version>
</dependency>
```

**Gradle:**

```groovy
dependencies {
implementation 'com.alibaba.fastjson2:fastjson2:2.0.61'
implementation 'com.alibaba.fastjson2:fastjson2:2.0.63'
}
```

Expand All @@ -116,15 +116,15 @@ dependencies {
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>2.0.61</version>
<version>2.0.63</version>
</dependency>
```

**Gradle:**

```groovy
dependencies {
implementation 'com.alibaba:fastjson:2.0.61'
implementation 'com.alibaba:fastjson:2.0.63'
}
```

Expand All @@ -138,7 +138,7 @@ dependencies {
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-kotlin</artifactId>
<version>2.0.61</version>
<version>2.0.63</version>
</dependency>
```

Expand All @@ -162,7 +162,7 @@ dependencies {

```kotlin
dependencies {
implementation("com.alibaba.fastjson2:fastjson2-kotlin:2.0.61")
implementation("com.alibaba.fastjson2:fastjson2-kotlin:2.0.63")
implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version")
implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlin_version")
}
Expand All @@ -178,7 +178,7 @@ dependencies {
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-extension-spring5</artifactId>
<version>2.0.61</version>
<version>2.0.63</version>
</dependency>
```

Expand All @@ -188,7 +188,7 @@ dependencies {
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-extension-spring6</artifactId>
<version>2.0.61</version>
<version>2.0.63</version>
</dependency>
```

Expand All @@ -197,9 +197,9 @@ dependencies {
```groovy
dependencies {
// 根据 Spring 版本选择:
implementation 'com.alibaba.fastjson2:fastjson2-extension-spring5:2.0.61'
implementation 'com.alibaba.fastjson2:fastjson2-extension-spring5:2.0.63'
// 或
implementation 'com.alibaba.fastjson2:fastjson2-extension-spring6:2.0.61'
implementation 'com.alibaba.fastjson2:fastjson2-extension-spring6:2.0.63'
}
```

Expand Down
2 changes: 1 addition & 1 deletion benchmark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-parent</artifactId>
<version>2.0.62-SNAPSHOT</version>
<version>2.0.63</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion benchmark_25/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-parent</artifactId>
<version>2.0.62-SNAPSHOT</version>
<version>2.0.63</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion codegen-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-parent</artifactId>
<version>2.0.62-SNAPSHOT</version>
<version>2.0.63</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion codegen/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-parent</artifactId>
<version>2.0.62-SNAPSHOT</version>
<version>2.0.63</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-parent</artifactId>
<version>2.0.62-SNAPSHOT</version>
<version>2.0.63</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion docs/FAQ_cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factor
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>2.0.61</version>
<version>2.0.63</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion docs/FAQ_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ Use the compatibility package as a drop-in replacement:
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>2.0.61</version>
<version>2.0.63</version>
</dependency>
```

Expand Down
4 changes: 2 additions & 2 deletions docs/Kotlin/kotlin_cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-kotlin</artifactId>
<version>2.0.61</version>
<version>2.0.63</version>
</dependency>
```

Expand All @@ -35,7 +35,7 @@

```kotlin
dependencies {
implementation("com.alibaba.fastjson2:fastjson2-kotlin:2.0.61")
implementation("com.alibaba.fastjson2:fastjson2-kotlin:2.0.63")
}
```

Expand Down
4 changes: 2 additions & 2 deletions docs/Kotlin/kotlin_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ If your project uses `kotlin`, you can use the` Fastjson-Kotlin` module, and use
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-kotlin</artifactId>
<version>2.0.61</version>
<version>2.0.63</version>
</dependency>
```

Expand All @@ -35,7 +35,7 @@ If the data class is used or the parameters are passed in through constructor, t

```kotlin
dependencies {
implementation("com.alibaba.fastjson2:fastjson2-kotlin:2.0.61")
implementation("com.alibaba.fastjson2:fastjson2-kotlin:2.0.63")
}
```

Expand Down
8 changes: 4 additions & 4 deletions docs/Spring/spring_support_cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,29 @@ Fastjson2采用多module的结构设计,对SpringFramework等框架的支持
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-extension-spring5</artifactId>
<version>2.0.61</version>
<version>2.0.63</version>
</dependency>

or

<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-extension-spring6</artifactId>
<version>2.0.61</version>
<version>2.0.63</version>
</dependency>
```

`Gradle`:

```groovy
dependencies {
implementation 'com.alibaba.fastjson2:fastjson2-extension-spring5:2.0.61'
implementation 'com.alibaba.fastjson2:fastjson2-extension-spring5:2.0.63'
}

or

dependencies {
implementation 'com.alibaba.fastjson2:fastjson2-extension-spring6:2.0.61'
implementation 'com.alibaba.fastjson2:fastjson2-extension-spring6:2.0.63'
}
```
> 2.0.23版本之后为了兼容Spring 5.x / 6.x,将不同版本独立开不同的依赖包。
Expand Down
8 changes: 4 additions & 4 deletions docs/Spring/spring_support_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,29 @@ independent in the `extension` dependency.
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-extension-spring5</artifactId>
<version>2.0.61</version>
<version>2.0.63</version>
</dependency>

or

<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-extension-spring6</artifactId>
<version>2.0.61</version>
<version>2.0.63</version>
</dependency>
```

`Gradle`:

```groovy
dependencies {
implementation 'com.alibaba.fastjson2:fastjson2-extension-spring5:2.0.61'
implementation 'com.alibaba.fastjson2:fastjson2-extension-spring5:2.0.63'
}

or

dependencies {
implementation 'com.alibaba.fastjson2:fastjson2-extension-spring6:2.0.61'
implementation 'com.alibaba.fastjson2:fastjson2-extension-spring6:2.0.63'
}
```
> After version 2.0.23, in order to be compatible with Spring 5.x / 6.x, different versions are independently opened with different dependency packages.
Expand Down
6 changes: 3 additions & 3 deletions docs/autotype_cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ FASTJSON支持AutoType功能,这个功能会在序列化的JSON字符串中带
* 支持配置safeMode,在safeMode打开后,显式传入AutoType参数也不起作用。
* 显式打开后,会经过内置黑名单过滤。该黑名单能拦截大部分常见风险,这个机制不能保证绝对安全,打开AutoType不应该在暴露在公网的场景下使用。

### 2.1 accept前缀不覆盖黑名单类型(2.0.62 起)
### 2.1 accept前缀不覆盖黑名单类型(2.0.63 起)
`ClassLoader`子类和JDK SQL的`DataSource`/`RowSet`实现是反序列化利用链的常见入口,**用前缀注册accept不再放行这些类型**,必须写全类名才算显式授权。适用于`addAutoTypeAccept`、`-Dfastjson2.autoTypeAccept`、`JSONReader.autoTypeFilter`,以及fastjson 1.x兼容模式的`ParserConfig.addAccept`。

```java
// 2.0.62 之前:前缀accept会放行 DruidDataSource
// 2.0.62 起:被拒绝
// 2.0.63 之前:前缀accept会放行 DruidDataSource
// 2.0.63 起:被拒绝
ParserConfig.getGlobalInstance().addAccept("com.alibaba.druid.pool.");

// 确实需要时,写全类名
Expand Down
6 changes: 3 additions & 3 deletions docs/autotype_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ FASTJSON supports the AutoType feature, which includes type information in the s
* **Supports `safeMode` configuration.** When `safeMode` is enabled, explicitly passing AutoType parameters will have no effect.
* **Filtered by a built-in blacklist when explicitly enabled.** This blacklist can intercept most common risks, but this mechanism cannot guarantee absolute security. Enabling AutoType should not be done in scenarios exposed to the public internet.

### 2.1 Accept prefixes do not cover blacklisted types (since 2.0.62)
### 2.1 Accept prefixes do not cover blacklisted types (since 2.0.63)
`ClassLoader` subclasses and JDK SQL `DataSource`/`RowSet` implementations are common deserialization gadget entry points, and **registering an accept entry by prefix no longer allows them**. Only an accept entry naming the type in full counts as an explicit opt-in. This applies to `addAutoTypeAccept`, `-Dfastjson2.autoTypeAccept`, `JSONReader.autoTypeFilter`, and `ParserConfig.addAccept` in fastjson 1.x compatibility mode.

```java
// before 2.0.62: the accept prefix allowed DruidDataSource
// since 2.0.62: rejected
// before 2.0.63: the accept prefix allowed DruidDataSource
// since 2.0.63: rejected
ParserConfig.getGlobalInstance().addAccept("com.alibaba.druid.pool.");

// name the type in full where it is genuinely needed
Expand Down
Loading
Loading