This is an automated email from the ASF dual-hosted git repository.

jianbin pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git


The following commit(s) were added to refs/heads/2.x by this push:
     new 6639332cf3 bugfix: ensure the Jakarta-related package paths are 
correct (#7940)
6639332cf3 is described below

commit 6639332cf33ccbcf25a02e906afbb518e54a9f40
Author: maple <[email protected]>
AuthorDate: Wed Jan 14 14:28:52 2026 +0800

    bugfix: ensure the Jakarta-related package paths are correct (#7940)
---
 changes/en-us/2.x.md                                                  | 2 ++
 changes/zh-cn/2.x.md                                                  | 2 ++
 .../java/io/seata/integration/http/JakartaSeataWebMvcConfigurer.java  | 3 +--
 .../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, 11 insertions(+), 7 deletions(-)

diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index a46a3cae93..28d074df56 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -26,6 +26,7 @@ Add changes here for all PR submitted to the 2.x branch.
 ### bugfix:
 
 - [[#7929](https://github.com/apache/incubator-seata/pull/7929)] fix 
KingbaseUndoLogManager INSERT_UNDO_LOG_SQL error
+- [[#7940](https://github.com/apache/incubator-seata/pull/7940)] ensure the 
Jakarta-related package paths are correct
 
 
 ### optimize:
@@ -50,6 +51,7 @@ Thanks to these contributors for their code commits. Please 
report an unintended
 - [slievrly](https://github.com/slievrly)
 - [lokidundun](https://github.com/lokidundun)
 - [LegendPei](https://github.com/LegendPei)
+- [maple525866](https://github.com/maple525866)
 
 
 Also, we receive many valuable issues, questions and advices from our 
community. Thanks for you all.
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index 3feb5509e9..22dbc3e332 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -26,6 +26,7 @@
 ### bugfix:
 
 - [[#7929](https://github.com/apache/incubator-seata/pull/7929)] 修复 
KingbaseUndoLogManager INSERT_UNDO_LOG_SQL 错误
+- [[#7940](https://github.com/apache/incubator-seata/pull/7940)] 
保证Jakarta相关包路径正确
 
 
 ### optimize:
@@ -50,6 +51,7 @@
 - [slievrly](https://github.com/slievrly)
 - [lokidundun](https://github.com/lokidundun)
 - [LegendPei](https://github.com/LegendPei)
+- [maple525866](https://github.com/maple525866)
 
 
 同时,我们收到了社区反馈的很多有价值的issue和建议,非常感谢大家。
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..41dda54cb2 100644
--- 
a/compatible/src/main/java/io/seata/integration/http/JakartaSeataWebMvcConfigurer.java
+++ 
b/compatible/src/main/java/io/seata/integration/http/JakartaSeataWebMvcConfigurer.java
@@ -20,5 +20,4 @@ package io.seata.integration.http;
  * The type Jakarta seata web mvc configurer.
  */
 @Deprecated
-public class JakartaSeataWebMvcConfigurer
-        extends 
org.apache.seata.integration.http.jakarta.JakartaSeataWebMvcConfigurer {}
+public class 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..393be677e9 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
@@ -16,8 +16,8 @@
  */
 package org.apache.seata.spring.boot.autoconfigure;
 
+import org.apache.seata.integration.http.JakartaSeataWebMvcConfigurer;
 import org.apache.seata.integration.http.SeataWebMvcConfigurer;
-import org.apache.seata.integration.http.jakarta.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..cce2d0786e 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
@@ -16,8 +16,8 @@
  */
 package org.apache.seata.spring.boot.autoconfigure;
 
+import org.apache.seata.integration.http.JakartaSeataWebMvcConfigurer;
 import org.apache.seata.integration.http.SeataWebMvcConfigurer;
-import org.apache.seata.integration.http.jakarta.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]

Reply via email to