From 14972cf8f1fcaab1e7cf35a6885aea2b7cd7b0c5 Mon Sep 17 00:00:00 2001 From: slievrly Date: Mon, 6 May 2024 11:52:32 +0800 Subject: [PATCH 1/2] optimize: optimize kotlin-maven-plugin --- build/pom.xml | 3 ++- spring/pom.xml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build/pom.xml b/build/pom.xml index 4503b6ff30d..70504e4592e 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -95,7 +95,7 @@ 3.8.1 0.6.1 - 1.9.21 + 1.9.23 3.8 1.3.6 @@ -439,6 +439,7 @@ --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens=java.base/java.io=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED diff --git a/spring/pom.xml b/spring/pom.xml index 9121af2b6fa..1a1cdfea2c5 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -95,6 +95,7 @@ kotlin-maven-plugin ${kotlin-maven-plugin.version} + true -Xjvm-default=all From 05e4c9eee8af3370b532d3144ec790ef2b93ad8b Mon Sep 17 00:00:00 2001 From: slievrly Date: Mon, 6 May 2024 12:19:46 +0800 Subject: [PATCH 2/2] add change --- changes/en-us/2.x.md | 1 + changes/zh-cn/2.x.md | 1 + 2 files changed, 2 insertions(+) diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md index bc99f91a0aa..66c96c9e732 100644 --- a/changes/en-us/2.x.md +++ b/changes/en-us/2.x.md @@ -129,6 +129,7 @@ Add changes here for all PR submitted to the 2.x branch. - [[#6429](https://github.com/apache/incubator-seata/pull/6429)] remove repetitive words - [[#6458](https://github.com/apache/incubator-seata/pull/6458)] add null value check for MAC address - [[#6516](https://github.com/apache/incubator-seata/pull/6516)] optimize code format +- [[#6521](https://github.com/apache/incubator-seata/pull/6521)] optimize kotlin-maven-plugin ### security: - [[#6069](https://github.com/apache/incubator-seata/pull/6069)] Upgrade Guava dependencies to fix security vulnerabilities diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md index f3e54c5f897..cd69dc25fc4 100644 --- a/changes/zh-cn/2.x.md +++ b/changes/zh-cn/2.x.md @@ -128,6 +128,7 @@ - [[#6429](https://github.com/apache/incubator-seata/pull/6429)] 移除重复注释 - [[#6405](https://github.com/apache/incubator-seata/pull/6405)] 修复 kotlin 编译失败 - [[#6412](https://github.com/apache/incubator-seata/pull/6412)] 优化 core 兼容模块 +- [[#6521](https://github.com/apache/incubator-seata/pull/6521)] 优化 kotlin-maven-plugin 编译失败问题 ### security: - [[#6069](https://github.com/apache/incubator-seata/pull/6069)] 升级Guava依赖版本,修复安全漏洞