From bcb736387bb6c0bfbfd0dc81477f02a955c89469 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Sat, 11 Oct 2025 17:22:38 +0800 Subject: [PATCH] [#4979] Adjust the use of Jakarta dependencies with the Inject annotation --- core/pom.xml | 4 ++++ .../servicecomb/demo/pojo/client/CodeFirstPojoClient.java | 3 +-- dependencies/default/pom.xml | 8 ++++---- foundations/foundation-test-scaffolding/pom.xml | 4 ++-- .../foundation/test/scaffolding/spring/SpringUtils.java | 4 ++-- .../org/apache/servicecomb/bizkeeper/BeansHolder.java | 2 +- .../org/apache/servicecomb/loadbalance/BeansHolder.java | 2 +- .../huaweicloud/dashboard/monitor/DataFactory.java | 3 +-- .../dashboard/monitor/MonitorBootListener.java | 4 ++-- .../provider/pojo/schema/PojoProducerMeta.java | 4 ++-- .../java-chassis-spring-boot-starter/pom.xml | 4 ++++ .../starter/ServiceCombSpringConfiguration.java | 4 ++-- 12 files changed, 26 insertions(+), 20 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index c2ce4e8eaa8..f9f59f59be5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -44,6 +44,10 @@ org.apache.servicecomb swagger-invocation-core + + jakarta.inject + jakarta.inject-api + io.zipkin.brave brave diff --git a/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/CodeFirstPojoClient.java b/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/CodeFirstPojoClient.java index dbc1bc2eb1e..a722dea988b 100644 --- a/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/CodeFirstPojoClient.java +++ b/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/CodeFirstPojoClient.java @@ -24,8 +24,6 @@ import java.util.Map; import java.util.concurrent.CountDownLatch; -import javax.inject.Inject; - import org.apache.servicecomb.demo.CategorizedTestCase; import org.apache.servicecomb.demo.CodeFirstPojoIntf; import org.apache.servicecomb.demo.TestMgr; @@ -41,6 +39,7 @@ import org.springframework.stereotype.Component; import io.vertx.core.Vertx; +import jakarta.inject.Inject; @Component public class CodeFirstPojoClient implements CategorizedTestCase { diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index b78d623a5df..7f9f937b439 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -62,7 +62,6 @@ 2.18.2 1.5.3 1.3.2 - 1 1.5 3.1.0 3.1.4 @@ -109,6 +108,7 @@ 3.0.9 1.0.4 3.1.10 + 2.0.1 ${basedir}/../.. @@ -586,9 +586,9 @@ - javax.inject - javax.inject - ${javax-inject.version} + jakarta.inject + jakarta.inject-api + ${jakarta-inject.version} diff --git a/foundations/foundation-test-scaffolding/pom.xml b/foundations/foundation-test-scaffolding/pom.xml index e32fa601aed..5ab74cd07a0 100644 --- a/foundations/foundation-test-scaffolding/pom.xml +++ b/foundations/foundation-test-scaffolding/pom.xml @@ -64,8 +64,8 @@ jackson-annotations - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api org.springframework diff --git a/foundations/foundation-test-scaffolding/src/main/java/org/apache/servicecomb/foundation/test/scaffolding/spring/SpringUtils.java b/foundations/foundation-test-scaffolding/src/main/java/org/apache/servicecomb/foundation/test/scaffolding/spring/SpringUtils.java index 828089633ba..5e64d9ef867 100644 --- a/foundations/foundation-test-scaffolding/src/main/java/org/apache/servicecomb/foundation/test/scaffolding/spring/SpringUtils.java +++ b/foundations/foundation-test-scaffolding/src/main/java/org/apache/servicecomb/foundation/test/scaffolding/spring/SpringUtils.java @@ -22,13 +22,13 @@ import java.util.Map; import java.util.UUID; -import javax.inject.Inject; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.StandardEnvironment; import org.springframework.util.StringValueResolver; +import jakarta.inject.Inject; + public final class SpringUtils { private SpringUtils() { } diff --git a/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/BeansHolder.java b/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/BeansHolder.java index 41f5efa5694..14e799812d6 100644 --- a/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/BeansHolder.java +++ b/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/BeansHolder.java @@ -18,7 +18,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; public class BeansHolder { @Inject diff --git a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/BeansHolder.java b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/BeansHolder.java index bb5c4db0f70..c742503d746 100644 --- a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/BeansHolder.java +++ b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/BeansHolder.java @@ -18,7 +18,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; public class BeansHolder { @Inject diff --git a/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/DataFactory.java b/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/DataFactory.java index 12ba9052ab3..b6d54eb1523 100644 --- a/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/DataFactory.java +++ b/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/DataFactory.java @@ -23,8 +23,6 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; - import org.apache.servicecomb.huaweicloud.dashboard.monitor.data.MonitorConstant; import org.apache.servicecomb.huaweicloud.dashboard.monitor.model.MonitorDataProvider; import org.apache.servicecomb.huaweicloud.dashboard.monitor.model.MonitorDataPublisher; @@ -32,6 +30,7 @@ import org.slf4j.LoggerFactory; import io.netty.util.concurrent.DefaultThreadFactory; +import jakarta.inject.Inject; public class DataFactory { private static final Logger LOGGER = LoggerFactory.getLogger(DataFactory.class); diff --git a/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/MonitorBootListener.java b/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/MonitorBootListener.java index 530e5330cba..63aa9557a7a 100644 --- a/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/MonitorBootListener.java +++ b/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/MonitorBootListener.java @@ -17,11 +17,11 @@ package org.apache.servicecomb.huaweicloud.dashboard.monitor; -import javax.inject.Inject; - import org.apache.servicecomb.core.BootListener; import org.apache.servicecomb.huaweicloud.dashboard.monitor.data.MonitorConstant; +import jakarta.inject.Inject; + public class MonitorBootListener implements BootListener { @Inject diff --git a/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/schema/PojoProducerMeta.java b/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/schema/PojoProducerMeta.java index 7526ec23fab..48b7c2e6e2a 100644 --- a/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/schema/PojoProducerMeta.java +++ b/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/schema/PojoProducerMeta.java @@ -17,12 +17,12 @@ package org.apache.servicecomb.provider.pojo.schema; -import javax.inject.Inject; - import com.google.common.annotations.VisibleForTesting; import org.apache.servicecomb.core.provider.producer.ProducerMeta; import org.springframework.beans.factory.InitializingBean; +import jakarta.inject.Inject; + public class PojoProducerMeta extends ProducerMeta implements InitializingBean { @Inject protected PojoProducers pojoProducers; diff --git a/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter/pom.xml b/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter/pom.xml index 82d0df5db8a..6d8afd3b1e7 100644 --- a/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter/pom.xml +++ b/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter/pom.xml @@ -63,6 +63,10 @@ org.apache.servicecomb handler-flowcontrol-qps + + jakarta.inject + jakarta.inject-api + \ No newline at end of file diff --git a/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter/src/main/java/org/apache/servicecomb/springboot2/starter/ServiceCombSpringConfiguration.java b/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter/src/main/java/org/apache/servicecomb/springboot2/starter/ServiceCombSpringConfiguration.java index 94b27999e64..c9cf8abfeba 100644 --- a/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter/src/main/java/org/apache/servicecomb/springboot2/starter/ServiceCombSpringConfiguration.java +++ b/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter/src/main/java/org/apache/servicecomb/springboot2/starter/ServiceCombSpringConfiguration.java @@ -16,14 +16,14 @@ */ package org.apache.servicecomb.springboot2.starter; -import javax.inject.Inject; - import org.apache.servicecomb.core.SCBApplicationListener; import org.apache.servicecomb.foundation.common.utils.BeanUtils; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; +import jakarta.inject.Inject; + @Configuration @ImportResource({BeanUtils.DEFAULT_BEAN_NORMAL_RESOURCE}) class ServiceCombSpringConfiguration {