[#4979] Adjust the use of Jakarta dependencies with the Inject annotation

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>

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 {

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>

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>

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() {
   }

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

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

huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/DataFactory.java

@@ -23,15 +23,14 @@
 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;
 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);

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

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;

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>

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 {