This is an automated email from the ASF dual-hosted git repository.
jianbin pushed a commit to branch 2.6.0
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.6.0 by this push:
new 9633b3a2b0 bugfix: ensure the Jakarta-related package paths are
correct. (#7938)
9633b3a2b0 is described below
commit 9633b3a2b047efe41eb5b97154482b435a16107c
Author: maple <[email protected]>
AuthorDate: Wed Jan 14 13:50:29 2026 +0800
bugfix: ensure the Jakarta-related package paths are correct. (#7938)
---
changes/en-us/2.6.0.md | 1 +
changes/zh-cn/2.6.0.md | 1 +
.../java/io/seata/integration/http/JakartaSeataWebMvcConfigurer.java | 2 +-
.../io/seata/integration/http/JakartaSeataWebMvcConfigurerTest.java | 4 ++--
.../apache/seata/integration/http/JakartaSeataWebMvcConfigurer.java | 3 ++-
.../seata/spring/boot/autoconfigure/SeataHttpAutoConfiguration.java | 2 +-
.../spring/boot/autoconfigure/SeataHttpAutoConfigurationTest.java | 2 +-
7 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/changes/en-us/2.6.0.md b/changes/en-us/2.6.0.md
index d033827b1f..1a10fd3a7e 100644
--- a/changes/en-us/2.6.0.md
+++ b/changes/en-us/2.6.0.md
@@ -73,6 +73,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#7881](https://github.com/apache/incubator-seata/pull/7881)] the
vgroup_table in the SQL files of all databases should use a three-column unique
constraint
- [[#7891](https://github.com/apache/incubator-seata/pull/7891)] raft
split-brain causes incorrect cluster information
- [[#7908](https://github.com/apache/incubator-seata/pull/7908)] handle
timestamp with time zone in postgresql primary key
+- [[#7938](https://github.com/apache/incubator-seata/pull/7938)] ensure the
Jakarta-related package paths are correct.
### optimize:
diff --git a/changes/zh-cn/2.6.0.md b/changes/zh-cn/2.6.0.md
index eefb232bcc..62c09278b1 100644
--- a/changes/zh-cn/2.6.0.md
+++ b/changes/zh-cn/2.6.0.md
@@ -73,6 +73,7 @@
- [[#7881](https://github.com/apache/incubator-seata/pull/7881)]
修复了除mysql之外其他数据库的sql文件关于vgroup_table的表，使用三列唯一索引以保证容灾迁移高可用
- [[#7891](https://github.com/apache/incubator-seata/pull/7891)]
修复raft重选举与心跳并发时可能导致namingserver侧的元数据存在多个leader
- [[#7908](https://github.com/apache/incubator-seata/pull/7908)] 在 PostgreSQL
主键中处理带时区的时间戳
+- [[#7938](https://github.com/apache/incubator-seata/pull/7938)]
保证Jakarta相关包路径正确
### optimize:
diff --git
a/compatible/src/main/java/io/seata/integration/http/JakartaSeataWebMvcConfigurer.java
b/compatible/src/main/java/io/seata/integration/http/JakartaSeataWebMvcConfigurer.java
index 2a0f5a0302..da4f88c545 100644
---
a/compatible/src/main/java/io/seata/integration/http/JakartaSeataWebMvcConfigurer.java
+++
b/compatible/src/main/java/io/seata/integration/http/JakartaSeataWebMvcConfigurer.java
@@ -21,4 +21,4 @@ package io.seata.integration.http;
*/
@Deprecated
public class JakartaSeataWebMvcConfigurer
- extends
org.apache.seata.integration.http.jakarta.JakartaSeataWebMvcConfigurer {}
+ extends org.apache.seata.integration.http.JakartaSeataWebMvcConfigurer
{}
diff --git
a/compatible/src/test/java/io/seata/integration/http/JakartaSeataWebMvcConfigurerTest.java
b/compatible/src/test/java/io/seata/integration/http/JakartaSeataWebMvcConfigurerTest.java
index f4dcbc703d..695b84b438 100644
---
a/compatible/src/test/java/io/seata/integration/http/JakartaSeataWebMvcConfigurerTest.java
+++
b/compatible/src/test/java/io/seata/integration/http/JakartaSeataWebMvcConfigurerTest.java
@@ -36,7 +36,7 @@ public class JakartaSeataWebMvcConfigurerTest {
@Test
public void testExtendsApacheSeataClass() {
assertTrue(
-
org.apache.seata.integration.http.jakarta.JakartaSeataWebMvcConfigurer.class.isAssignableFrom(
+
org.apache.seata.integration.http.JakartaSeataWebMvcConfigurer.class.isAssignableFrom(
JakartaSeataWebMvcConfigurer.class),
"JakartaSeataWebMvcConfigurer should extend Apache Seata
JakartaSeataWebMvcConfigurer");
}
@@ -51,7 +51,7 @@ public class JakartaSeataWebMvcConfigurerTest {
public void testInstanceOfApacheSeataClass() {
JakartaSeataWebMvcConfigurer configurer = new
JakartaSeataWebMvcConfigurer();
assertTrue(
- configurer instanceof
org.apache.seata.integration.http.jakarta.JakartaSeataWebMvcConfigurer,
+ configurer instanceof
org.apache.seata.integration.http.JakartaSeataWebMvcConfigurer,
"Instance should be of Apache Seata
JakartaSeataWebMvcConfigurer type");
}
}
diff --git
a/extensions/rpc/seata-http-jakarta/src/main/java/org/apache/seata/integration/http/JakartaSeataWebMvcConfigurer.java
b/extensions/rpc/seata-http-jakarta/src/main/java/org/apache/seata/integration/http/JakartaSeataWebMvcConfigurer.java
index fc9f127105..cbc51a36d5 100644
---
a/extensions/rpc/seata-http-jakarta/src/main/java/org/apache/seata/integration/http/JakartaSeataWebMvcConfigurer.java
+++
b/extensions/rpc/seata-http-jakarta/src/main/java/org/apache/seata/integration/http/JakartaSeataWebMvcConfigurer.java
@@ -14,8 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.seata.integration.http.jakarta;
+package org.apache.seata.integration.http;
+import
org.apache.seata.integration.http.jakarta.JakartaTransactionPropagationInterceptor;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
diff --git
a/seata-spring-boot-starter/src/main/java/org/apache/seata/spring/boot/autoconfigure/SeataHttpAutoConfiguration.java
b/seata-spring-boot-starter/src/main/java/org/apache/seata/spring/boot/autoconfigure/SeataHttpAutoConfiguration.java
index f8b8789320..9ac1a0e626 100644
---
a/seata-spring-boot-starter/src/main/java/org/apache/seata/spring/boot/autoconfigure/SeataHttpAutoConfiguration.java
+++
b/seata-spring-boot-starter/src/main/java/org/apache/seata/spring/boot/autoconfigure/SeataHttpAutoConfiguration.java
@@ -17,7 +17,7 @@
package org.apache.seata.spring.boot.autoconfigure;
import org.apache.seata.integration.http.SeataWebMvcConfigurer;
-import org.apache.seata.integration.http.jakarta.JakartaSeataWebMvcConfigurer;
+import org.apache.seata.integration.http.JakartaSeataWebMvcConfigurer;
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
diff --git
a/seata-spring-boot-starter/src/test/java/org/apache/seata/spring/boot/autoconfigure/SeataHttpAutoConfigurationTest.java
b/seata-spring-boot-starter/src/test/java/org/apache/seata/spring/boot/autoconfigure/SeataHttpAutoConfigurationTest.java
index 0bbb48322c..461f848e17 100644
---
a/seata-spring-boot-starter/src/test/java/org/apache/seata/spring/boot/autoconfigure/SeataHttpAutoConfigurationTest.java
+++
b/seata-spring-boot-starter/src/test/java/org/apache/seata/spring/boot/autoconfigure/SeataHttpAutoConfigurationTest.java
@@ -17,7 +17,7 @@
package org.apache.seata.spring.boot.autoconfigure;
import org.apache.seata.integration.http.SeataWebMvcConfigurer;
-import org.apache.seata.integration.http.jakarta.JakartaSeataWebMvcConfigurer;
+import org.apache.seata.integration.http.JakartaSeataWebMvcConfigurer;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.FilteredClassLoader;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
