Repository: avaje/avaje-inject
Pull request #82 (2020-11-05 04:11:10)

Change to jakarta.inject from javax.inject


Patch:
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/BeanReader.java b/inject-generator/src/main/java/io/avaje/inject/generator/BeanReader.java
index 2a079a7d..59a9aa0c 100644
--- a/inject-generator/src/main/java/io/avaje/inject/generator/BeanReader.java
+++ b/inject-generator/src/main/java/io/avaje/inject/generator/BeanReader.java
@@ -4,9 +4,9 @@ import io.avaje.inject.Bean;
 import io.avaje.inject.Primary;
 import io.avaje.inject.Secondary;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Qualifier;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Qualifier;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/Constants.java b/inject-generator/src/main/java/io/avaje/inject/generator/Constants.java
index 1fb90cb2..759ad7d0 100644
--- a/inject-generator/src/main/java/io/avaje/inject/generator/Constants.java
+++ b/inject-generator/src/main/java/io/avaje/inject/generator/Constants.java
@@ -4,9 +4,9 @@ class Constants {
 
   static final String KOTLIN_METADATA = "kotlin.Metadata";
 
-  static final String PROVIDER = "javax.inject.Provider";
-  static final String SINGLETON = "javax.inject.Singleton";
-  static final String INJECT = "javax.inject.Inject";
+  static final String PROVIDER = "jakarta.inject.Provider";
+  static final String SINGLETON = "jakarta.inject.Singleton";
+  static final String INJECT = "jakarta.inject.Inject";
 
   static final String PATH = "io.avaje.http.api.Path";
   static final String CONTROLLER = "io.avaje.http.api.Controller";
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/MethodReader.java b/inject-generator/src/main/java/io/avaje/inject/generator/MethodReader.java
index c264b70c..8e493ee1 100644
--- a/inject-generator/src/main/java/io/avaje/inject/generator/MethodReader.java
+++ b/inject-generator/src/main/java/io/avaje/inject/generator/MethodReader.java
@@ -2,7 +2,7 @@ package io.avaje.inject.generator;
 
 import io.avaje.inject.Bean;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/Processor.java b/inject-generator/src/main/java/io/avaje/inject/generator/Processor.java
index 20d834a2..1a72471b 100644
--- a/inject-generator/src/main/java/io/avaje/inject/generator/Processor.java
+++ b/inject-generator/src/main/java/io/avaje/inject/generator/Processor.java
@@ -8,7 +8,7 @@ import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.FilerException;
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/Util.java b/inject-generator/src/main/java/io/avaje/inject/generator/Util.java
index 45d885b9..2718ccf0 100644
--- a/inject-generator/src/main/java/io/avaje/inject/generator/Util.java
+++ b/inject-generator/src/main/java/io/avaje/inject/generator/Util.java
@@ -1,7 +1,7 @@
 package io.avaje.inject.generator;
 
-import javax.inject.Named;
-import javax.inject.Qualifier;
+import jakarta.inject.Named;
+import jakarta.inject.Qualifier;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.type.DeclaredType;
@@ -9,7 +9,7 @@ import javax.lang.model.type.TypeMirror;
 
 class Util {
 
-  private static final String PROVIDER_PREFIX = "javax.inject.Provider<";
+  private static final String PROVIDER_PREFIX = "jakarta.inject.Provider<";
 
   private static final int PROVIDER_LENGTH = PROVIDER_PREFIX.length();
 
diff --git a/inject/pom.xml b/inject/pom.xml
index d17235ef..09b6674e 100644
--- a/inject/pom.xml
+++ b/inject/pom.xml
@@ -14,9 +14,9 @@
   <dependencies>
 
     <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-      <version>1</version>
+      <groupId>jakarta.inject</groupId>
+      <artifactId>jakarta.inject-api</artifactId>
+      <version>2.0.0</version>
     </dependency>
 
     <dependency>
diff --git a/inject/src/main/java/io/avaje/inject/Factory.java b/inject/src/main/java/io/avaje/inject/Factory.java
index 25d0a3b0..d880ce5a 100644
--- a/inject/src/main/java/io/avaje/inject/Factory.java
+++ b/inject/src/main/java/io/avaje/inject/Factory.java
@@ -12,7 +12,7 @@ import java.lang.annotation.Target;
  * often use environment variables and system properties into account when building the bean.
  * </p>
  * <p>
- * Relative to <code>javax.inject.Provider</code> Factory and Bean provide a more flexible
+ * Relative to <code>jakarta.inject.Provider</code> Factory and Bean provide a more flexible
  * approach that allows dependencies on the method (as method parameters) as well as multiple
  * methods on the single factory bean. The expectation is that we tend to use Factory and Bean
  * rather than Provider.
diff --git a/inject/src/main/java/io/avaje/inject/spi/DBeanMap.java b/inject/src/main/java/io/avaje/inject/spi/DBeanMap.java
index f8549444..010a87e8 100644
--- a/inject/src/main/java/io/avaje/inject/spi/DBeanMap.java
+++ b/inject/src/main/java/io/avaje/inject/spi/DBeanMap.java
@@ -2,7 +2,7 @@ package io.avaje.inject.spi;
 
 import io.avaje.inject.BeanEntry;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/inject/src/main/java/io/avaje/inject/spi/DContextEntryBean.java b/inject/src/main/java/io/avaje/inject/spi/DContextEntryBean.java
index f9ffcd3c..0f33b7ad 100644
--- a/inject/src/main/java/io/avaje/inject/spi/DContextEntryBean.java
+++ b/inject/src/main/java/io/avaje/inject/spi/DContextEntryBean.java
@@ -2,7 +2,7 @@ package io.avaje.inject.spi;
 
 import io.avaje.inject.BeanEntry;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 import java.util.Objects;
 
 /**
diff --git a/inject/src/main/java9/module-info.java b/inject/src/main/java9/module-info.java
index 22c84e14..21488ca0 100644
--- a/inject/src/main/java9/module-info.java
+++ b/inject/src/main/java9/module-info.java
@@ -3,7 +3,7 @@ module io.avaje.inject {
   exports io.avaje.inject;
   exports io.avaje.inject.spi;
 
-  requires transitive javax.inject;
+  requires transitive jakarta.inject;
   requires transitive org.slf4j;
   requires static org.mockito;
 


Test patch:
diff --git a/inject-generator/src/test/java/io/avaje/inject/generator/IncludeAnnotationsTest.java b/inject-generator/src/test/java/io/avaje/inject/generator/IncludeAnnotationsTest.java
index 66b4be57..e5ae0329 100644
--- a/inject-generator/src/test/java/io/avaje/inject/generator/IncludeAnnotationsTest.java
+++ b/inject-generator/src/test/java/io/avaje/inject/generator/IncludeAnnotationsTest.java
@@ -5,8 +5,8 @@ import io.avaje.inject.Primary;
 import io.avaje.inject.Secondary;
 import org.junit.jupiter.api.Test;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 import static io.avaje.inject.generator.IncludeAnnotations.include;
 import static org.junit.jupiter.api.Assertions.assertFalse;
diff --git a/inject-test/src/test/java/org/example/coffee/CoffeeMaker.java b/inject-test/src/test/java/org/example/coffee/CoffeeMaker.java
index 204edb18..79510666 100644
--- a/inject-test/src/test/java/org/example/coffee/CoffeeMaker.java
+++ b/inject-test/src/test/java/org/example/coffee/CoffeeMaker.java
@@ -2,7 +2,7 @@ package org.example.coffee;
 
 import org.example.coffee.grind.Grinder;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 //@ContextModule(name = "coffee-maker")
 @Singleton
diff --git a/inject-test/src/test/java/org/example/coffee/circular/CircA.java b/inject-test/src/test/java/org/example/coffee/circular/CircA.java
index b57ff20b..54610d47 100644
--- a/inject-test/src/test/java/org/example/coffee/circular/CircA.java
+++ b/inject-test/src/test/java/org/example/coffee/circular/CircA.java
@@ -1,6 +1,6 @@
 package org.example.coffee.circular;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 class CircA {
diff --git a/inject-test/src/test/java/org/example/coffee/circular/CircB.java b/inject-test/src/test/java/org/example/coffee/circular/CircB.java
index ad5fbcde..d85d8246 100644
--- a/inject-test/src/test/java/org/example/coffee/circular/CircB.java
+++ b/inject-test/src/test/java/org/example/coffee/circular/CircB.java
@@ -1,6 +1,6 @@
 package org.example.coffee.circular;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 class CircB {
diff --git a/inject-test/src/test/java/org/example/coffee/circular/CircC.java b/inject-test/src/test/java/org/example/coffee/circular/CircC.java
index 51ac9ba2..5f7ed030 100644
--- a/inject-test/src/test/java/org/example/coffee/circular/CircC.java
+++ b/inject-test/src/test/java/org/example/coffee/circular/CircC.java
@@ -1,7 +1,7 @@
 package org.example.coffee.circular;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 @Singleton
 class CircC {
diff --git a/inject-test/src/test/java/org/example/coffee/core/DuperPump.java b/inject-test/src/test/java/org/example/coffee/core/DuperPump.java
index 6d0134be..c2224cac 100644
--- a/inject-test/src/test/java/org/example/coffee/core/DuperPump.java
+++ b/inject-test/src/test/java/org/example/coffee/core/DuperPump.java
@@ -2,7 +2,7 @@ package org.example.coffee.core;
 
 import org.example.coffee.Pump;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class DuperPump implements Pump {
diff --git a/inject-test/src/test/java/org/example/coffee/core/Steamer.java b/inject-test/src/test/java/org/example/coffee/core/Steamer.java
index 0dd0b794..b5dabe03 100644
--- a/inject-test/src/test/java/org/example/coffee/core/Steamer.java
+++ b/inject-test/src/test/java/org/example/coffee/core/Steamer.java
@@ -1,7 +1,7 @@
 package org.example.coffee.core;
 
 import javax.annotation.PreDestroy;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class Steamer {
diff --git a/inject-test/src/test/java/org/example/coffee/factory/Configuration.java b/inject-test/src/test/java/org/example/coffee/factory/Configuration.java
index 961d5ffd..db406c5e 100644
--- a/inject-test/src/test/java/org/example/coffee/factory/Configuration.java
+++ b/inject-test/src/test/java/org/example/coffee/factory/Configuration.java
@@ -6,7 +6,7 @@ import io.avaje.inject.PostConstruct;
 import io.avaje.inject.PreDestroy;
 import org.example.coffee.CoffeeMaker;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * Factory bean (ala Micronaut @Factory or Spring @Configuration)
diff --git a/inject-test/src/test/java/org/example/coffee/factory/MultipleOtherThings.java b/inject-test/src/test/java/org/example/coffee/factory/MultipleOtherThings.java
index 3ccf78b9..4e711de1 100644
--- a/inject-test/src/test/java/org/example/coffee/factory/MultipleOtherThings.java
+++ b/inject-test/src/test/java/org/example/coffee/factory/MultipleOtherThings.java
@@ -1,7 +1,7 @@
 package org.example.coffee.factory;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class MultipleOtherThings {
diff --git a/inject-test/src/test/java/org/example/coffee/factory/MyFactory.java b/inject-test/src/test/java/org/example/coffee/factory/MyFactory.java
index 3246e2f2..cabefc5b 100644
--- a/inject-test/src/test/java/org/example/coffee/factory/MyFactory.java
+++ b/inject-test/src/test/java/org/example/coffee/factory/MyFactory.java
@@ -4,7 +4,7 @@ import io.avaje.inject.Bean;
 import io.avaje.inject.Factory;
 import org.example.coffee.factory.other.Something;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 @Factory
 public class MyFactory {
diff --git a/inject-test/src/test/java/org/example/coffee/factory/SomeImplBean.java b/inject-test/src/test/java/org/example/coffee/factory/SomeImplBean.java
index 848d5d55..37a942b7 100644
--- a/inject-test/src/test/java/org/example/coffee/factory/SomeImplBean.java
+++ b/inject-test/src/test/java/org/example/coffee/factory/SomeImplBean.java
@@ -3,7 +3,7 @@ package org.example.coffee.factory;
 import io.avaje.inject.Secondary;
 import org.example.coffee.factory.other.Something;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Secondary
 @Singleton
diff --git a/inject-test/src/test/java/org/example/coffee/factory/StartConfig.java b/inject-test/src/test/java/org/example/coffee/factory/StartConfig.java
index 35862359..fb6d716f 100644
--- a/inject-test/src/test/java/org/example/coffee/factory/StartConfig.java
+++ b/inject-test/src/test/java/org/example/coffee/factory/StartConfig.java
@@ -1,6 +1,6 @@
 package org.example.coffee.factory;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class StartConfig {
diff --git a/inject-test/src/test/java/org/example/coffee/factory/Unused.java b/inject-test/src/test/java/org/example/coffee/factory/Unused.java
index 772c083f..1e00718c 100644
--- a/inject-test/src/test/java/org/example/coffee/factory/Unused.java
+++ b/inject-test/src/test/java/org/example/coffee/factory/Unused.java
@@ -2,8 +2,8 @@ package org.example.coffee.factory;
 
 import org.example.coffee.factory.other.Something;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class Unused {
diff --git a/inject-test/src/test/java/org/example/coffee/factory/other/BlueOtherThing.java b/inject-test/src/test/java/org/example/coffee/factory/other/BlueOtherThing.java
index 61d4486a..9afbeb68 100644
--- a/inject-test/src/test/java/org/example/coffee/factory/other/BlueOtherThing.java
+++ b/inject-test/src/test/java/org/example/coffee/factory/other/BlueOtherThing.java
@@ -2,8 +2,8 @@ package org.example.coffee.factory.other;
 
 import org.example.coffee.factory.Otherthing;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Named("blue")
diff --git a/inject-test/src/test/java/org/example/coffee/factory/other/RedOtherThing.java b/inject-test/src/test/java/org/example/coffee/factory/other/RedOtherThing.java
index 1b3590d0..9c1cbed6 100644
--- a/inject-test/src/test/java/org/example/coffee/factory/other/RedOtherThing.java
+++ b/inject-test/src/test/java/org/example/coffee/factory/other/RedOtherThing.java
@@ -2,8 +2,8 @@ package org.example.coffee.factory.other;
 
 import org.example.coffee.factory.Otherthing;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Named("red")
diff --git a/inject-test/src/test/java/org/example/coffee/fruit/AppleService.java b/inject-test/src/test/java/org/example/coffee/fruit/AppleService.java
index 59cf4b70..218ca486 100644
--- a/inject-test/src/test/java/org/example/coffee/fruit/AppleService.java
+++ b/inject-test/src/test/java/org/example/coffee/fruit/AppleService.java
@@ -1,7 +1,7 @@
 package org.example.coffee.fruit;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 @Singleton
 class AppleService {
diff --git a/inject-test/src/test/java/org/example/coffee/fruit/BananaService.java b/inject-test/src/test/java/org/example/coffee/fruit/BananaService.java
index ee6804be..de3e0a3b 100644
--- a/inject-test/src/test/java/org/example/coffee/fruit/BananaService.java
+++ b/inject-test/src/test/java/org/example/coffee/fruit/BananaService.java
@@ -1,7 +1,7 @@
 package org.example.coffee.fruit;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 @Fruit
 @Singleton
diff --git a/inject-test/src/test/java/org/example/coffee/fruit/PeachService.java b/inject-test/src/test/java/org/example/coffee/fruit/PeachService.java
index a50924f8..54f80f73 100644
--- a/inject-test/src/test/java/org/example/coffee/fruit/PeachService.java
+++ b/inject-test/src/test/java/org/example/coffee/fruit/PeachService.java
@@ -1,6 +1,6 @@
 package org.example.coffee.fruit;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Fruit
 @Singleton
diff --git a/inject-test/src/test/java/org/example/coffee/generic/HazManager.java b/inject-test/src/test/java/org/example/coffee/generic/HazManager.java
index 9a59f943..a0050f47 100644
--- a/inject-test/src/test/java/org/example/coffee/generic/HazManager.java
+++ b/inject-test/src/test/java/org/example/coffee/generic/HazManager.java
@@ -1,7 +1,7 @@
 package org.example.coffee.generic;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 /**
  * Has a Dependency via generic interface.
diff --git a/inject-test/src/test/java/org/example/coffee/generic/HazRepo.java b/inject-test/src/test/java/org/example/coffee/generic/HazRepo.java
index 2d666867..95bfc7ac 100644
--- a/inject-test/src/test/java/org/example/coffee/generic/HazRepo.java
+++ b/inject-test/src/test/java/org/example/coffee/generic/HazRepo.java
@@ -1,6 +1,6 @@
 package org.example.coffee.generic;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 /**
  * Implementation of a generic interface.
diff --git a/inject-test/src/test/java/org/example/coffee/generic/MultiGenericConsumer.java b/inject-test/src/test/java/org/example/coffee/generic/MultiGenericConsumer.java
index 414dec23..c6e85a30 100644
--- a/inject-test/src/test/java/org/example/coffee/generic/MultiGenericConsumer.java
+++ b/inject-test/src/test/java/org/example/coffee/generic/MultiGenericConsumer.java
@@ -2,7 +2,7 @@ package org.example.coffee.generic;
 
 import org.example.coffee.grind.AMusher;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 /**
  * Has multiple dependencies that are generic interface.
diff --git a/inject-test/src/test/java/org/example/coffee/generic/SomeGenericString.java b/inject-test/src/test/java/org/example/coffee/generic/SomeGenericString.java
index 8ab19788..3bb97400 100644
--- a/inject-test/src/test/java/org/example/coffee/generic/SomeGenericString.java
+++ b/inject-test/src/test/java/org/example/coffee/generic/SomeGenericString.java
@@ -1,6 +1,6 @@
 package org.example.coffee.generic;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class SomeGenericString implements SomeGeneric<String> {
diff --git a/inject-test/src/test/java/org/example/coffee/grind/AMusher.java b/inject-test/src/test/java/org/example/coffee/grind/AMusher.java
index e98f0671..7d6e08f5 100644
--- a/inject-test/src/test/java/org/example/coffee/grind/AMusher.java
+++ b/inject-test/src/test/java/org/example/coffee/grind/AMusher.java
@@ -2,7 +2,7 @@ package org.example.coffee.grind;
 
 import io.avaje.inject.spi.BeanLifecycle;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class AMusher implements BeanLifecycle {
diff --git a/inject-test/src/test/java/org/example/coffee/grind/BMusher.java b/inject-test/src/test/java/org/example/coffee/grind/BMusher.java
index 0644b0ff..dab00163 100644
--- a/inject-test/src/test/java/org/example/coffee/grind/BMusher.java
+++ b/inject-test/src/test/java/org/example/coffee/grind/BMusher.java
@@ -2,7 +2,7 @@ package org.example.coffee.grind;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class BMusher {
diff --git a/inject-test/src/test/java/org/example/coffee/grind/Grinder.java b/inject-test/src/test/java/org/example/coffee/grind/Grinder.java
index 1329404e..a77bac75 100644
--- a/inject-test/src/test/java/org/example/coffee/grind/Grinder.java
+++ b/inject-test/src/test/java/org/example/coffee/grind/Grinder.java
@@ -8,8 +8,8 @@ import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 
 @Data
diff --git a/inject-test/src/test/java/org/example/coffee/list/A2Somei.java b/inject-test/src/test/java/org/example/coffee/list/A2Somei.java
index ffd22f65..39060bdc 100644
--- a/inject-test/src/test/java/org/example/coffee/list/A2Somei.java
+++ b/inject-test/src/test/java/org/example/coffee/list/A2Somei.java
@@ -1,7 +1,7 @@
 package org.example.coffee.list;
 
 import javax.annotation.Priority;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Priority(22)
diff --git a/inject-test/src/test/java/org/example/coffee/list/ASomei.java b/inject-test/src/test/java/org/example/coffee/list/ASomei.java
index 5ae52742..386f74dd 100644
--- a/inject-test/src/test/java/org/example/coffee/list/ASomei.java
+++ b/inject-test/src/test/java/org/example/coffee/list/ASomei.java
@@ -1,7 +1,7 @@
 package org.example.coffee.list;
 
 import javax.annotation.Priority;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Priority(2)
diff --git a/inject-test/src/test/java/org/example/coffee/list/BSomei.java b/inject-test/src/test/java/org/example/coffee/list/BSomei.java
index 25f415c6..d2be0530 100644
--- a/inject-test/src/test/java/org/example/coffee/list/BSomei.java
+++ b/inject-test/src/test/java/org/example/coffee/list/BSomei.java
@@ -1,7 +1,7 @@
 package org.example.coffee.list;
 
 import javax.annotation.Priority;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Priority(1)
diff --git a/inject-test/src/test/java/org/example/coffee/list/CombinedSetSomei.java b/inject-test/src/test/java/org/example/coffee/list/CombinedSetSomei.java
index 7f0e93de..4fd69e78 100644
--- a/inject-test/src/test/java/org/example/coffee/list/CombinedSetSomei.java
+++ b/inject-test/src/test/java/org/example/coffee/list/CombinedSetSomei.java
@@ -1,7 +1,7 @@
 package org.example.coffee.list;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
diff --git a/inject-test/src/test/java/org/example/coffee/list/CombinedSomei.java b/inject-test/src/test/java/org/example/coffee/list/CombinedSomei.java
index 81335cee..47d7305c 100644
--- a/inject-test/src/test/java/org/example/coffee/list/CombinedSomei.java
+++ b/inject-test/src/test/java/org/example/coffee/list/CombinedSomei.java
@@ -1,7 +1,7 @@
 package org.example.coffee.list;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.util.List;
 import java.util.stream.Collectors;
 
diff --git a/inject-test/src/test/java/org/example/coffee/primary/OtherPEmailer.java b/inject-test/src/test/java/org/example/coffee/primary/OtherPEmailer.java
index 3036bffc..dc814363 100644
--- a/inject-test/src/test/java/org/example/coffee/primary/OtherPEmailer.java
+++ b/inject-test/src/test/java/org/example/coffee/primary/OtherPEmailer.java
@@ -1,6 +1,6 @@
 package org.example.coffee.primary;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 //@Secondary
 @Singleton
diff --git a/inject-test/src/test/java/org/example/coffee/primary/PrimePEmailer.java b/inject-test/src/test/java/org/example/coffee/primary/PrimePEmailer.java
index 2677649b..5b8c6984 100644
--- a/inject-test/src/test/java/org/example/coffee/primary/PrimePEmailer.java
+++ b/inject-test/src/test/java/org/example/coffee/primary/PrimePEmailer.java
@@ -2,7 +2,7 @@ package org.example.coffee.primary;
 
 import io.avaje.inject.Primary;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Primary
 @Singleton
diff --git a/inject-test/src/test/java/org/example/coffee/primary/UserOfPEmailer.java b/inject-test/src/test/java/org/example/coffee/primary/UserOfPEmailer.java
index 34bbba4a..3a2c535a 100644
--- a/inject-test/src/test/java/org/example/coffee/primary/UserOfPEmailer.java
+++ b/inject-test/src/test/java/org/example/coffee/primary/UserOfPEmailer.java
@@ -1,6 +1,6 @@
 package org.example.coffee.primary;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class UserOfPEmailer {
diff --git a/inject-test/src/test/java/org/example/coffee/priority/base/ABasei.java b/inject-test/src/test/java/org/example/coffee/priority/base/ABasei.java
index 46898f19..c57c7616 100644
--- a/inject-test/src/test/java/org/example/coffee/priority/base/ABasei.java
+++ b/inject-test/src/test/java/org/example/coffee/priority/base/ABasei.java
@@ -2,7 +2,7 @@ package org.example.coffee.priority.base;
 
 import io.avaje.inject.Priority;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Priority(42)
diff --git a/inject-test/src/test/java/org/example/coffee/priority/base/BBasei.java b/inject-test/src/test/java/org/example/coffee/priority/base/BBasei.java
index cb65b12c..4ac43c4f 100644
--- a/inject-test/src/test/java/org/example/coffee/priority/base/BBasei.java
+++ b/inject-test/src/test/java/org/example/coffee/priority/base/BBasei.java
@@ -2,7 +2,7 @@ package org.example.coffee.priority.base;
 
 import io.avaje.inject.Priority;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Priority(7)
diff --git a/inject-test/src/test/java/org/example/coffee/priority/base/CBasei.java b/inject-test/src/test/java/org/example/coffee/priority/base/CBasei.java
index 80443e8f..7c3a247b 100644
--- a/inject-test/src/test/java/org/example/coffee/priority/base/CBasei.java
+++ b/inject-test/src/test/java/org/example/coffee/priority/base/CBasei.java
@@ -2,7 +2,7 @@ package org.example.coffee.priority.base;
 
 import io.avaje.inject.Priority;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Priority(1)
diff --git a/inject-test/src/test/java/org/example/coffee/priority/custom/AOtheri.java b/inject-test/src/test/java/org/example/coffee/priority/custom/AOtheri.java
index 1bec7e4c..f2ccd8f4 100644
--- a/inject-test/src/test/java/org/example/coffee/priority/custom/AOtheri.java
+++ b/inject-test/src/test/java/org/example/coffee/priority/custom/AOtheri.java
@@ -1,6 +1,6 @@
 package org.example.coffee.priority.custom;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 @CustomPriority(42)
diff --git a/inject-test/src/test/java/org/example/coffee/priority/custom/BOtheri.java b/inject-test/src/test/java/org/example/coffee/priority/custom/BOtheri.java
index 196bbfd1..837fd0ca 100644
--- a/inject-test/src/test/java/org/example/coffee/priority/custom/BOtheri.java
+++ b/inject-test/src/test/java/org/example/coffee/priority/custom/BOtheri.java
@@ -1,6 +1,6 @@
 package org.example.coffee.priority.custom;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 @CustomPriority(7)
diff --git a/inject-test/src/test/java/org/example/coffee/priority/custom/COtheri.java b/inject-test/src/test/java/org/example/coffee/priority/custom/COtheri.java
index 8a0d86a7..536090f7 100644
--- a/inject-test/src/test/java/org/example/coffee/priority/custom/COtheri.java
+++ b/inject-test/src/test/java/org/example/coffee/priority/custom/COtheri.java
@@ -1,6 +1,6 @@
 package org.example.coffee.priority.custom;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 @CustomPriority(1)
diff --git a/inject-test/src/test/java/org/example/coffee/provider/AProvProvider.java b/inject-test/src/test/java/org/example/coffee/provider/AProvProvider.java
index 81073806..3c589023 100644
--- a/inject-test/src/test/java/org/example/coffee/provider/AProvProvider.java
+++ b/inject-test/src/test/java/org/example/coffee/provider/AProvProvider.java
@@ -2,8 +2,8 @@ package org.example.coffee.provider;
 
 import org.example.coffee.grind.Grinder;
 
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class AProvProvider implements Provider<AProv> {
diff --git a/inject-test/src/test/java/org/example/coffee/provider/ProvOther.java b/inject-test/src/test/java/org/example/coffee/provider/ProvOther.java
index 0bdaf0c5..7b1a1abf 100644
--- a/inject-test/src/test/java/org/example/coffee/provider/ProvOther.java
+++ b/inject-test/src/test/java/org/example/coffee/provider/ProvOther.java
@@ -1,6 +1,6 @@
 package org.example.coffee.provider;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class ProvOther {
diff --git a/inject-test/src/test/java/org/example/coffee/provider/ProvOther2.java b/inject-test/src/test/java/org/example/coffee/provider/ProvOther2.java
index ba220ead..7baa28e1 100644
--- a/inject-test/src/test/java/org/example/coffee/provider/ProvOther2.java
+++ b/inject-test/src/test/java/org/example/coffee/provider/ProvOther2.java
@@ -1,6 +1,6 @@
 package org.example.coffee.provider;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class ProvOther2 {
diff --git a/inject-test/src/test/java/org/example/coffee/qualifier/Blue.java b/inject-test/src/test/java/org/example/coffee/qualifier/Blue.java
index 0408908e..ef250fdf 100644
--- a/inject-test/src/test/java/org/example/coffee/qualifier/Blue.java
+++ b/inject-test/src/test/java/org/example/coffee/qualifier/Blue.java
@@ -1,6 +1,6 @@
 package org.example.coffee.qualifier;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 import java.lang.annotation.Retention;
 
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/inject-test/src/test/java/org/example/coffee/qualifier/BlueStore.java b/inject-test/src/test/java/org/example/coffee/qualifier/BlueStore.java
index 67f75978..4ad8fb6f 100644
--- a/inject-test/src/test/java/org/example/coffee/qualifier/BlueStore.java
+++ b/inject-test/src/test/java/org/example/coffee/qualifier/BlueStore.java
@@ -1,6 +1,6 @@
 package org.example.coffee.qualifier;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Blue
 @Singleton
diff --git a/inject-test/src/test/java/org/example/coffee/qualifier/GreenStore.java b/inject-test/src/test/java/org/example/coffee/qualifier/GreenStore.java
index 33cd9895..09820223 100644
--- a/inject-test/src/test/java/org/example/coffee/qualifier/GreenStore.java
+++ b/inject-test/src/test/java/org/example/coffee/qualifier/GreenStore.java
@@ -1,6 +1,6 @@
 package org.example.coffee.qualifier;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class GreenStore implements SomeStore {
diff --git a/inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithFieldQualifier.java b/inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithFieldQualifier.java
index b255184e..e1982160 100644
--- a/inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithFieldQualifier.java
+++ b/inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithFieldQualifier.java
@@ -1,7 +1,7 @@
 package org.example.coffee.qualifier;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class StoreManagerWithFieldQualifier {
diff --git a/inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithNamed.java b/inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithNamed.java
index 309b381f..36280b00 100644
--- a/inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithNamed.java
+++ b/inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithNamed.java
@@ -1,7 +1,7 @@
 package org.example.coffee.qualifier;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class StoreManagerWithNamed {
diff --git a/inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithQualifier.java b/inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithQualifier.java
index df41a245..cd7635d6 100644
--- a/inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithQualifier.java
+++ b/inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithQualifier.java
@@ -1,6 +1,6 @@
 package org.example.coffee.qualifier;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class StoreManagerWithQualifier {
diff --git a/inject-test/src/test/java/org/example/coffee/secondary/DefaultSEmailer.java b/inject-test/src/test/java/org/example/coffee/secondary/DefaultSEmailer.java
index 5320a335..9831e990 100644
--- a/inject-test/src/test/java/org/example/coffee/secondary/DefaultSEmailer.java
+++ b/inject-test/src/test/java/org/example/coffee/secondary/DefaultSEmailer.java
@@ -2,7 +2,7 @@ package org.example.coffee.secondary;
 
 import io.avaje.inject.Secondary;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Secondary
 @Singleton
diff --git a/inject-test/src/test/java/org/example/coffee/secondary/OtherSEmailer.java b/inject-test/src/test/java/org/example/coffee/secondary/OtherSEmailer.java
index 210e5aa9..575f61b3 100644
--- a/inject-test/src/test/java/org/example/coffee/secondary/OtherSEmailer.java
+++ b/inject-test/src/test/java/org/example/coffee/secondary/OtherSEmailer.java
@@ -1,6 +1,6 @@
 package org.example.coffee.secondary;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class OtherSEmailer implements SEmailer {
diff --git a/inject-test/src/test/java/org/example/coffee/secondary/WidgetSecondary.java b/inject-test/src/test/java/org/example/coffee/secondary/WidgetSecondary.java
index 2b93b715..012f14f4 100644
--- a/inject-test/src/test/java/org/example/coffee/secondary/WidgetSecondary.java
+++ b/inject-test/src/test/java/org/example/coffee/secondary/WidgetSecondary.java
@@ -2,7 +2,7 @@ package org.example.coffee.secondary;
 
 import io.avaje.inject.Secondary;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Secondary
diff --git a/inject-test/src/test/java/org/example/coffee/secondary/WidgetUser.java b/inject-test/src/test/java/org/example/coffee/secondary/WidgetUser.java
index ab430dcf..a1394298 100644
--- a/inject-test/src/test/java/org/example/coffee/secondary/WidgetUser.java
+++ b/inject-test/src/test/java/org/example/coffee/secondary/WidgetUser.java
@@ -1,6 +1,6 @@
 package org.example.coffee.secondary;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class WidgetUser {
diff --git a/inject-test/src/test/java/org/example/iface/MySomeNested.java b/inject-test/src/test/java/org/example/iface/MySomeNested.java
index 8f5e99e5..c1af4548 100644
--- a/inject-test/src/test/java/org/example/iface/MySomeNested.java
+++ b/inject-test/src/test/java/org/example/iface/MySomeNested.java
@@ -1,6 +1,6 @@
 package org.example.iface;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class MySomeNested implements Some.Nested {
diff --git a/inject-test/src/test/java/org/example/request/AController.java b/inject-test/src/test/java/org/example/request/AController.java
index 54325de1..d04d0195 100644
--- a/inject-test/src/test/java/org/example/request/AController.java
+++ b/inject-test/src/test/java/org/example/request/AController.java
@@ -4,7 +4,7 @@ package org.example.request;
 import io.avaje.http.api.Controller;
 import io.javalin.http.Context;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 @Controller
 public class AController {
diff --git a/inject-test/src/test/java/org/example/request/AService.java b/inject-test/src/test/java/org/example/request/AService.java
index cde91e5d..fe6833fb 100644
--- a/inject-test/src/test/java/org/example/request/AService.java
+++ b/inject-test/src/test/java/org/example/request/AService.java
@@ -1,6 +1,6 @@
 package org.example.request;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class AService {
diff --git a/inject-test/src/test/java/org/example/request/AWebRoute.java b/inject-test/src/test/java/org/example/request/AWebRoute.java
index 777f2265..c0c8bb4e 100644
--- a/inject-test/src/test/java/org/example/request/AWebRoute.java
+++ b/inject-test/src/test/java/org/example/request/AWebRoute.java
@@ -3,7 +3,7 @@ package org.example.request;
 import io.avaje.inject.spi.BeanFactory;
 import io.javalin.http.Context;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 /**
  * Simulate approx a Javalin web route with request scoped context.
diff --git a/inject-test/src/test/java/org/example/request/BWebRoute.java b/inject-test/src/test/java/org/example/request/BWebRoute.java
index 07a9ce80..f619e709 100644
--- a/inject-test/src/test/java/org/example/request/BWebRoute.java
+++ b/inject-test/src/test/java/org/example/request/BWebRoute.java
@@ -4,7 +4,7 @@ import io.avaje.inject.spi.BeanFactory2;
 import io.helidon.webserver.ServerRequest;
 import io.helidon.webserver.ServerResponse;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 /**
  * Simulate web route generation for Helidon.
diff --git a/inject-test/src/test/java/org/example/request/JexController.java b/inject-test/src/test/java/org/example/request/JexController.java
index 12cc4eb2..ae97d57f 100644
--- a/inject-test/src/test/java/org/example/request/JexController.java
+++ b/inject-test/src/test/java/org/example/request/JexController.java
@@ -4,7 +4,7 @@ package org.example.request;
 import io.avaje.http.api.Controller;
 import io.avaje.jex.Context;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 @Controller
 public class JexController {