This is an automated email from the ASF dual-hosted git repository.
youling1128 pushed a commit to branch 2.9.x
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/2.9.x by this push:
new 45fd99481 [#4979] Adjust the use of Jakarta dependencies with the
Inject annotation (#4980)
45fd99481 is described below
commit 45fd994812d8c26dcb21990ca4c04e8b975ae1bb
Author: Alex <[email protected]>
AuthorDate: Sat Oct 11 17:45:18 2025 +0800
[#4979] Adjust the use of Jakarta dependencies with the Inject annotation
(#4980)
---
core/pom.xml | 4 ++++
.../apache/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 ++--
.../main/java/org/apache/servicecomb/bizkeeper/BeansHolder.java | 2 +-
.../main/java/org/apache/servicecomb/loadbalance/BeansHolder.java | 2 +-
.../servicecomb/huaweicloud/dashboard/monitor/DataFactory.java | 3 +--
.../huaweicloud/dashboard/monitor/MonitorBootListener.java | 4 ++--
.../apache/servicecomb/provider/pojo/schema/PojoProducerMeta.java | 4 ++--
.../spring-boot-starters/java-chassis-spring-boot-starter/pom.xml | 4 ++++
.../springboot2/starter/ServiceCombSpringConfiguration.java | 4 ++--
12 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index c2ce4e8ea..f9f59f59b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -44,6 +44,10 @@
<groupId>org.apache.servicecomb</groupId>
<artifactId>swagger-invocation-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ </dependency>
<dependency>
<groupId>io.zipkin.brave</groupId>
<artifactId>brave</artifactId>
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 dbc1bc2eb..a722dea98 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.List;
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.apache.servicecomb.swagger.invocation.context.InvocationContext;
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 b78d623a5..7f9f937b4 100644
--- a/dependencies/default/pom.xml
+++ b/dependencies/default/pom.xml
@@ -62,7 +62,6 @@
<jackson.version>2.18.2</jackson.version>
<java-websocket.version>1.5.3</java-websocket.version>
<javax-annotation.version>1.3.2</javax-annotation.version>
- <javax-inject.version>1</javax-inject.version>
<javax-resource.version>1.5</javax-resource.version>
<jakarta.ws.rs.version>3.1.0</jakarta.ws.rs.version>
<jersey.version>3.1.4</jersey.version>
@@ -109,6 +108,7 @@
<groovy.version>3.0.9</groovy.version>
<reactive-streams.version>1.0.4</reactive-streams.version>
<rxjava3.version>3.1.10</rxjava3.version>
+ <jakarta-inject.version>2.0.1</jakarta-inject.version>
<!-- Base dir of main -->
<main.basedir>${basedir}/../..</main.basedir>
</properties>
@@ -586,9 +586,9 @@
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>${javax-inject.version}</version>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>${jakarta-inject.version}</version>
</dependency>
<dependency>
diff --git a/foundations/foundation-test-scaffolding/pom.xml
b/foundations/foundation-test-scaffolding/pom.xml
index e32fa601a..5ab74cd07 100644
--- a/foundations/foundation-test-scaffolding/pom.xml
+++ b/foundations/foundation-test-scaffolding/pom.xml
@@ -64,8 +64,8 @@
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
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 828089633..5e64d9ef8 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.lang.reflect.Method;
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 41f5efa56..14e799812 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 @@ package org.apache.servicecomb.bizkeeper;
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 bb5c4db0f..c742503d7 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 @@ package org.apache.servicecomb.loadbalance;
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 12ba9052a..b6d54eb15 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.ScheduledExecutorService;
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.Logger;
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 530e5330c..63aa9557a 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 7526ec23f..48b7c2e6e 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 82d0df5db..6d8afd3b1 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 @@
<groupId>org.apache.servicecomb</groupId>
<artifactId>handler-flowcontrol-qps</artifactId>
</dependency>
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ </dependency>
</dependencies>
</project>
\ 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 94b27999e..c9cf8abfe 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 {
