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

Jump to bottom

security: upgrade kafka-clients to 3.6.1 #6147

Merged
merged 4 commits into from
Dec 20, 2023
Merged

security: upgrade kafka-clients to 3.6.1 #6147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3b29e5
security: upgrade kafka-clients to 3.5.2
slievrly Dec 13, 2023
611cd26
Merge branch '2.x' into 2.x_23_12_13_03
funky-eyes Dec 15, 2023
fda95a9
fix conflicts
slievrly Dec 19, 2023
188f629
Merge remote-tracking branch 'origin/2.x_23_12_13_03' into 2.x_23_12_…
slievrly Dec 19, 2023
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: 1 addition & 0 deletions changes/en-us/2.x.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Add changes here for all PR submitted to the 2.x branch.
### security:
- [[#6069](https://github.com/seata/seata/pull/6069)] Upgrade Guava dependencies to fix security vulnerabilities
- [[#6144](https://github.com/seata/seata/pull/6144)] upgrade nacos client to 1.4.6
- [[#6147](https://github.com/seata/seata/pull/6147)] upgrade kafka-clients to 3.6.1

### test:
- [[#6081](https://github.com/seata/seata/pull/6081)] add `test-os.yml` for testing the OS
Expand Down
1 change: 1 addition & 0 deletions changes/zh-cn/2.x.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
- [[#6069](https://github.com/seata/seata/pull/6069)] 升级Guava依赖版本，修复安全漏洞
- [[#6144](https://github.com/seata/seata/pull/6144)] 升级Nacos依赖版本至1.4.6
- [[#6145](https://github.com/seata/seata/pull/6145)] 升级 jettison依赖版本至1.5.4
- [[#6147](https://github.com/seata/seata/pull/6147)] 升级 kafka-clients依赖至3.6.1

### test:
- [[#6081](https://github.com/seata/seata/pull/6081)] 添加 `test-os.yml` 用于测试seata在各种操作系统下的运行情况
Expand Down
12 changes: 12 additions & 0 deletions dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
<logback.version>1.2.9</logback.version>
<logstash-logback-encoder.version>6.5</logstash-logback-encoder.version>
<kafka-appender.version>0.2.0-RC2</kafka-appender.version>
<kafka-clients.version>3.6.1</kafka-clients.version>

<!-- redis -->
<jedis.version>3.8.0</jedis.version>
Expand Down Expand Up @@ -697,6 +698,17 @@
<groupId>com.github.danielwegener</groupId>
<artifactId>logback-kafka-appender</artifactId>
<version>${kafka-appender.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
<version>${kafka-clients.version}</version>
</dependency>


Expand Down
4 changes: 4 additions & 0 deletions server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,10 @@
<groupId>com.github.danielwegener</groupId>
<artifactId>logback-kafka-appender</artifactId>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
</dependency>
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>jraft-core</artifactId>
Expand Down
Loading