Repository: avaje/avaje-inject
Pull request #221 (2022-05-29 22:44:22)

Restore javax.inject -> jakarta.inject


Patch:
diff --git a/inject-generator/pom.xml b/inject-generator/pom.xml
index f68f6315..d3f474cc 100644
--- a/inject-generator/pom.xml
+++ b/inject-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>7.5</version>
+    <version>8.5</version>
   </parent>
 
   <artifactId>avaje-inject-generator</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>7.5</version>
+      <version>8.5</version>
     </dependency>
 
     <!-- test dependencies -->
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 de476852..eabe9ee2 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
@@ -12,9 +12,9 @@ class Constants {
   static final String KOTLIN_METADATA = "kotlin.Metadata";
   static final String TYPE = "java.lang.reflect.Type";
 
-  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 51a387e7..6692b157 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
@@ -1,7 +1,7 @@
 package io.avaje.inject.generator;
 
 import io.avaje.inject.Bean;
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import javax.lang.model.element.*;
 import javax.lang.model.type.TypeMirror;
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 5dfb80d6..484f80a7 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
@@ -5,8 +5,8 @@ import io.avaje.inject.Factory;
 import io.avaje.inject.InjectModule;
 import io.avaje.inject.Prototype;
 import io.avaje.inject.spi.Proxy;
-import javax.inject.Scope;
-import javax.inject.Singleton;
+import jakarta.inject.Scope;
+import jakarta.inject.Singleton;
 
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.ProcessingEnvironment;
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/TypeAnnotationReader.java b/inject-generator/src/main/java/io/avaje/inject/generator/TypeAnnotationReader.java
index 2f9449af..7daba57b 100644
--- a/inject-generator/src/main/java/io/avaje/inject/generator/TypeAnnotationReader.java
+++ b/inject-generator/src/main/java/io/avaje/inject/generator/TypeAnnotationReader.java
@@ -1,6 +1,6 @@
 package io.avaje.inject.generator;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.TypeElement;
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/TypeExtendsInjection.java b/inject-generator/src/main/java/io/avaje/inject/generator/TypeExtendsInjection.java
index c439f36d..b1b19106 100644
--- a/inject-generator/src/main/java/io/avaje/inject/generator/TypeExtendsInjection.java
+++ b/inject-generator/src/main/java/io/avaje/inject/generator/TypeExtendsInjection.java
@@ -2,8 +2,8 @@ package io.avaje.inject.generator;
 
 import io.avaje.inject.Bean;
 import io.avaje.inject.Prototype;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/TypeReader.java b/inject-generator/src/main/java/io/avaje/inject/generator/TypeReader.java
index 1e61f267..d6acfd5e 100644
--- a/inject-generator/src/main/java/io/avaje/inject/generator/TypeReader.java
+++ b/inject-generator/src/main/java/io/avaje/inject/generator/TypeReader.java
@@ -1,6 +1,6 @@
 package io.avaje.inject.generator;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
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 475e4590..594966f5 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 String OPTIONAL_PREFIX = "java.util.Optional<";
   private static final String NULLABLE = "Nullable";
   private static final int PROVIDER_LENGTH = PROVIDER_PREFIX.length();
diff --git a/inject/pom.xml b/inject/pom.xml
index 3366cd26..d64a3629 100644
--- a/inject/pom.xml
+++ b/inject/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>7.5</version>
+    <version>8.5</version>
   </parent>
 
   <artifactId>avaje-inject</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>jakarta.inject</groupId>
       <artifactId>jakarta.inject-api</artifactId>
-      <version>1.0.5</version>
+      <version>2.0.1</version>
     </dependency>
 
     <dependency>
diff --git a/inject/src/main/java/io/avaje/inject/spi/Builder.java b/inject/src/main/java/io/avaje/inject/spi/Builder.java
index 55fd47ed..0622f860 100644
--- a/inject/src/main/java/io/avaje/inject/spi/Builder.java
+++ b/inject/src/main/java/io/avaje/inject/spi/Builder.java
@@ -1,7 +1,7 @@
 package io.avaje.inject.spi;
 
 import io.avaje.inject.BeanScope;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 import java.lang.reflect.Type;
 import java.util.List;
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 cd725d94..1a49cab6 100644
--- a/inject/src/main/java/io/avaje/inject/spi/DBeanMap.java
+++ b/inject/src/main/java/io/avaje/inject/spi/DBeanMap.java
@@ -1,6 +1,6 @@
 package io.avaje.inject.spi;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 import java.lang.reflect.Type;
 import java.util.Collections;
diff --git a/inject/src/main/java/io/avaje/inject/spi/DBuilder.java b/inject/src/main/java/io/avaje/inject/spi/DBuilder.java
index 29f19980..f72b3e98 100644
--- a/inject/src/main/java/io/avaje/inject/spi/DBuilder.java
+++ b/inject/src/main/java/io/avaje/inject/spi/DBuilder.java
@@ -2,7 +2,7 @@ package io.avaje.inject.spi;
 
 import io.avaje.inject.BeanEntry;
 import io.avaje.inject.BeanScope;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 import java.lang.reflect.Type;
 import java.util.*;
diff --git a/inject/src/main/java/io/avaje/inject/spi/DContextEntry.java b/inject/src/main/java/io/avaje/inject/spi/DContextEntry.java
index 770ba648..9e83583d 100644
--- a/inject/src/main/java/io/avaje/inject/spi/DContextEntry.java
+++ b/inject/src/main/java/io/avaje/inject/spi/DContextEntry.java
@@ -1,6 +1,6 @@
 package io.avaje.inject.spi;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 import java.util.ArrayList;
 import java.util.List;
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 cbf76865..afdf9fa1 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/java/io/avaje/inject/spi/ProviderPromise.java b/inject/src/main/java/io/avaje/inject/spi/ProviderPromise.java
index fce8a466..8a7ba479 100644
--- a/inject/src/main/java/io/avaje/inject/spi/ProviderPromise.java
+++ b/inject/src/main/java/io/avaje/inject/spi/ProviderPromise.java
@@ -1,6 +1,6 @@
 package io.avaje.inject.spi;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 import java.util.function.Consumer;
 
 /**
diff --git a/inject/src/main/java/io/avaje/inject/spi/SuppliedBean.java b/inject/src/main/java/io/avaje/inject/spi/SuppliedBean.java
index 995e58fd..acc1bfb0 100644
--- a/inject/src/main/java/io/avaje/inject/spi/SuppliedBean.java
+++ b/inject/src/main/java/io/avaje/inject/spi/SuppliedBean.java
@@ -2,7 +2,7 @@ package io.avaje.inject.spi;
 
 import org.mockito.Mockito;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import java.lang.reflect.Type;
 import java.util.function.Consumer;
diff --git a/inject/src/main/java/module-info.java b/inject/src/main/java/module-info.java
index 2fa97af4..c2c6b7e1 100644
--- a/inject/src/main/java/module-info.java
+++ b/inject/src/main/java/module-info.java
@@ -5,7 +5,7 @@ module io.avaje.inject {
   exports io.avaje.inject.spi;
 
   requires transitive io.avaje.lang;
-  requires transitive java.inject;
+  requires transitive jakarta.inject;
   requires static org.mockito;
 
   uses io.avaje.inject.spi.Module;
diff --git a/pom.xml b/pom.xml
index e032f303..74cb7458 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.avaje</groupId>
   <artifactId>avaje-inject-parent</artifactId>
-  <version>7.5</version>
+  <version>8.5</version>
   <packaging>pom</packaging>
   <name>avaje inject parent</name>
   <description>parent pom for avaje inject library</description>


Test patch:
diff --git a/blackbox-test-inject/pom.xml b/blackbox-test-inject/pom.xml
index b553de25..2a2f0e6a 100644
--- a/blackbox-test-inject/pom.xml
+++ b/blackbox-test-inject/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>7.5</version>
+    <version>8.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/ExampleService.java b/blackbox-test-inject/src/main/java/org/example/myapp/ExampleService.java
index c725463d..0dba92de 100644
--- a/blackbox-test-inject/src/main/java/org/example/myapp/ExampleService.java
+++ b/blackbox-test-inject/src/main/java/org/example/myapp/ExampleService.java
@@ -1,6 +1,6 @@
 package org.example.myapp;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import org.example.myapp.aspect.MyTimed;
 
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/HelloService.java b/blackbox-test-inject/src/main/java/org/example/myapp/HelloService.java
index 39761c92..26aeaef3 100644
--- a/blackbox-test-inject/src/main/java/org/example/myapp/HelloService.java
+++ b/blackbox-test-inject/src/main/java/org/example/myapp/HelloService.java
@@ -2,7 +2,7 @@ package org.example.myapp;
 
 import io.avaje.inject.PostConstruct;
 import io.avaje.inject.PreDestroy;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import org.example.myapp.aspect.*;
 
 import java.io.IOException;
diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/OtherService.java b/blackbox-test-inject/src/main/java/org/example/myapp/OtherService.java
index f7acaa06..bca4681f 100644
--- a/blackbox-test-inject/src/main/java/org/example/myapp/OtherService.java
+++ b/blackbox-test-inject/src/main/java/org/example/myapp/OtherService.java
@@ -1,6 +1,6 @@
 package org.example.myapp;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import org.example.myapp.aspect.MyAround;
 import org.example.myapp.aspect.MyTimed;
 
diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MyAroundAspect.java b/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MyAroundAspect.java
index aa58d08b..53a87187 100644
--- a/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MyAroundAspect.java
+++ b/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MyAroundAspect.java
@@ -3,7 +3,7 @@ package org.example.myapp.aspect;
 import io.avaje.inject.aop.AspectProvider;
 import io.avaje.inject.aop.Invocation;
 import io.avaje.inject.aop.MethodInterceptor;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MyBeforeAspect.java b/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MyBeforeAspect.java
index c83587f9..9a704feb 100644
--- a/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MyBeforeAspect.java
+++ b/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MyBeforeAspect.java
@@ -3,7 +3,7 @@ package org.example.myapp.aspect;
 import io.avaje.inject.aop.AspectProvider;
 import io.avaje.inject.aop.Invocation;
 import io.avaje.inject.aop.MethodInterceptor;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import java.lang.reflect.Method;
 
diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MyMultiInvokeAspect.java b/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MyMultiInvokeAspect.java
index 867d6cfe..3a5c5354 100644
--- a/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MyMultiInvokeAspect.java
+++ b/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MyMultiInvokeAspect.java
@@ -3,7 +3,7 @@ package org.example.myapp.aspect;
 import io.avaje.inject.aop.AspectProvider;
 import io.avaje.inject.aop.Invocation;
 import io.avaje.inject.aop.MethodInterceptor;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MySkipAspect.java b/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MySkipAspect.java
index 3a5f529b..810a503b 100644
--- a/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MySkipAspect.java
+++ b/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MySkipAspect.java
@@ -3,7 +3,7 @@ package org.example.myapp.aspect;
 import io.avaje.inject.aop.AspectProvider;
 import io.avaje.inject.aop.Invocation;
 import io.avaje.inject.aop.MethodInterceptor;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import java.lang.reflect.Method;
 
diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MyThrowingAspect.java b/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MyThrowingAspect.java
index e253d32a..871058ad 100644
--- a/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MyThrowingAspect.java
+++ b/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MyThrowingAspect.java
@@ -3,7 +3,7 @@ package org.example.myapp.aspect;
 import io.avaje.inject.aop.AspectProvider;
 import io.avaje.inject.aop.Invocation;
 import io.avaje.inject.aop.MethodInterceptor;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MyTimedAspect.java b/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MyTimedAspect.java
index 755c5148..39d5bb7b 100644
--- a/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MyTimedAspect.java
+++ b/blackbox-test-inject/src/main/java/org/example/myapp/aspect/MyTimedAspect.java
@@ -3,7 +3,7 @@ package org.example.myapp.aspect;
 import io.avaje.inject.aop.AspectProvider;
 import io.avaje.inject.aop.Invocation;
 import io.avaje.inject.aop.MethodInterceptor;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import java.lang.reflect.Method;
 
diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/config/AppConfig.java b/blackbox-test-inject/src/main/java/org/example/myapp/config/AppConfig.java
index 677c84e7..c485b53b 100644
--- a/blackbox-test-inject/src/main/java/org/example/myapp/config/AppConfig.java
+++ b/blackbox-test-inject/src/main/java/org/example/myapp/config/AppConfig.java
@@ -4,8 +4,8 @@ import io.avaje.inject.Bean;
 import io.avaje.inject.Component;
 import io.avaje.inject.Factory;
 import io.avaje.inject.Prototype;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 import org.example.myapp.HelloData;
 
 @Factory
diff --git a/blackbox-test-inject/src/test/java/org/example/myapp/InjectExtension_injectFromTestModule_Test.java b/blackbox-test-inject/src/test/java/org/example/myapp/InjectExtension_injectFromTestModule_Test.java
index 19c99ba5..ab58c495 100644
--- a/blackbox-test-inject/src/test/java/org/example/myapp/InjectExtension_injectFromTestModule_Test.java
+++ b/blackbox-test-inject/src/test/java/org/example/myapp/InjectExtension_injectFromTestModule_Test.java
@@ -1,7 +1,7 @@
 package org.example.myapp;
 
 import io.avaje.inject.test.InjectExtension;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.example.myapp.testconfig.CountTestScopeStart;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/blackbox-test-inject/src/test/java/org/example/myapp/InjectExtension_injectLocalMock_Test.java b/blackbox-test-inject/src/test/java/org/example/myapp/InjectExtension_injectLocalMock_Test.java
index c4484b8b..eb989433 100644
--- a/blackbox-test-inject/src/test/java/org/example/myapp/InjectExtension_injectLocalMock_Test.java
+++ b/blackbox-test-inject/src/test/java/org/example/myapp/InjectExtension_injectLocalMock_Test.java
@@ -1,7 +1,7 @@
 package org.example.myapp;
 
 import io.avaje.inject.test.InjectExtension;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/blackbox-test-inject/src/test/java/org/example/myapp/InjectExtension_viaAnnotation_Test.java b/blackbox-test-inject/src/test/java/org/example/myapp/InjectExtension_viaAnnotation_Test.java
index 6b7d7aae..3da8a6ea 100644
--- a/blackbox-test-inject/src/test/java/org/example/myapp/InjectExtension_viaAnnotation_Test.java
+++ b/blackbox-test-inject/src/test/java/org/example/myapp/InjectExtension_viaAnnotation_Test.java
@@ -1,7 +1,7 @@
 package org.example.myapp;
 
 import io.avaje.inject.test.InjectTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
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 0a050ddf..d8680024 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/pom.xml b/inject-test/pom.xml
index bd77202c..040f675e 100644
--- a/inject-test/pom.xml
+++ b/inject-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>7.5</version>
+    <version>8.5</version>
   </parent>
 
   <artifactId>avaje-inject-test</artifactId>
@@ -124,7 +124,7 @@
             <path>
               <groupId>io.avaje</groupId>
               <artifactId>avaje-inject-generator</artifactId>
-              <version>7.5</version>
+              <version>8.5</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
diff --git a/inject-test/src/main/java/io/avaje/inject/test/MetaReader.java b/inject-test/src/main/java/io/avaje/inject/test/MetaReader.java
index 2b173e5c..6fd4bea0 100644
--- a/inject-test/src/main/java/io/avaje/inject/test/MetaReader.java
+++ b/inject-test/src/main/java/io/avaje/inject/test/MetaReader.java
@@ -2,9 +2,9 @@ package io.avaje.inject.test;
 
 import io.avaje.inject.BeanScope;
 import io.avaje.inject.BeanScopeBuilder;
-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 org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
diff --git a/inject-test/src/main/java/io/avaje/inject/test/TestScope.java b/inject-test/src/main/java/io/avaje/inject/test/TestScope.java
index a3e08b64..6ea32f8f 100644
--- a/inject-test/src/main/java/io/avaje/inject/test/TestScope.java
+++ b/inject-test/src/main/java/io/avaje/inject/test/TestScope.java
@@ -1,6 +1,6 @@
 package io.avaje.inject.test;
 
-import javax.inject.Scope;
+import jakarta.inject.Scope;
 
 /**
  * Specify test scope for a `@Factory` or `@Singleton`.
diff --git a/inject-test/src/test/java/io/avaje/inject/test/MetaReaderTest.java b/inject-test/src/test/java/io/avaje/inject/test/MetaReaderTest.java
index 2f23877e..0d5769b5 100644
--- a/inject-test/src/test/java/io/avaje/inject/test/MetaReaderTest.java
+++ b/inject-test/src/test/java/io/avaje/inject/test/MetaReaderTest.java
@@ -1,7 +1,7 @@
 package io.avaje.inject.test;
 
 import io.avaje.inject.BeanScope;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.example.coffee.Pump;
 import org.example.coffee.grind.AMusher;
 import org.example.coffee.grind.Grinder;
diff --git a/inject-test/src/test/java/org/example/MyCustomScope.java b/inject-test/src/test/java/org/example/MyCustomScope.java
index 18626794..d7bbe5f6 100644
--- a/inject-test/src/test/java/org/example/MyCustomScope.java
+++ b/inject-test/src/test/java/org/example/MyCustomScope.java
@@ -1,7 +1,7 @@
 package org.example;
 
 import io.avaje.inject.InjectModule;
-import javax.inject.Scope;
+import jakarta.inject.Scope;
 import org.example.custom.loc.LocalExternal;
 
 @Scope
diff --git a/inject-test/src/test/java/org/example/autonamed/MyAutoB2.java b/inject-test/src/test/java/org/example/autonamed/MyAutoB2.java
index 86f97ea8..9286d254 100644
--- a/inject-test/src/test/java/org/example/autonamed/MyAutoB2.java
+++ b/inject-test/src/test/java/org/example/autonamed/MyAutoB2.java
@@ -1,6 +1,6 @@
 package org.example.autonamed;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class MyAutoB2 {
diff --git a/inject-test/src/test/java/org/example/autonamed/MyAutoB2Explicit.java b/inject-test/src/test/java/org/example/autonamed/MyAutoB2Explicit.java
index 96ccf787..c5b87de6 100644
--- a/inject-test/src/test/java/org/example/autonamed/MyAutoB2Explicit.java
+++ b/inject-test/src/test/java/org/example/autonamed/MyAutoB2Explicit.java
@@ -1,7 +1,7 @@
 package org.example.autonamed;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class MyAutoB2Explicit {
diff --git a/inject-test/src/test/java/org/example/autonamed/MyAutoB2OneImplied.java b/inject-test/src/test/java/org/example/autonamed/MyAutoB2OneImplied.java
index bd52bd6e..707b2a62 100644
--- a/inject-test/src/test/java/org/example/autonamed/MyAutoB2OneImplied.java
+++ b/inject-test/src/test/java/org/example/autonamed/MyAutoB2OneImplied.java
@@ -1,6 +1,6 @@
 package org.example.autonamed;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class MyAutoB2OneImplied {
diff --git a/inject-test/src/test/java/org/example/autonamed/MyAutoB2TwoExplicit.java b/inject-test/src/test/java/org/example/autonamed/MyAutoB2TwoExplicit.java
index 069be5ea..c39e74ce 100644
--- a/inject-test/src/test/java/org/example/autonamed/MyAutoB2TwoExplicit.java
+++ b/inject-test/src/test/java/org/example/autonamed/MyAutoB2TwoExplicit.java
@@ -1,7 +1,7 @@
 package org.example.autonamed;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class MyAutoB2TwoExplicit {
diff --git a/inject-test/src/test/java/org/example/autonamed/MyAutoName.java b/inject-test/src/test/java/org/example/autonamed/MyAutoName.java
index b73b1747..7ee42aaf 100644
--- a/inject-test/src/test/java/org/example/autonamed/MyAutoName.java
+++ b/inject-test/src/test/java/org/example/autonamed/MyAutoName.java
@@ -1,6 +1,6 @@
 package org.example.autonamed;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class MyAutoName {
diff --git a/inject-test/src/test/java/org/example/autonamed/MyAutoName2.java b/inject-test/src/test/java/org/example/autonamed/MyAutoName2.java
index 0b18ed57..fe269d43 100644
--- a/inject-test/src/test/java/org/example/autonamed/MyAutoName2.java
+++ b/inject-test/src/test/java/org/example/autonamed/MyAutoName2.java
@@ -1,7 +1,7 @@
 package org.example.autonamed;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class MyAutoName2 {
diff --git a/inject-test/src/test/java/org/example/autonamed/MyAutoNameFactory.java b/inject-test/src/test/java/org/example/autonamed/MyAutoNameFactory.java
index 23fe1f56..c1ae74a3 100644
--- a/inject-test/src/test/java/org/example/autonamed/MyAutoNameFactory.java
+++ b/inject-test/src/test/java/org/example/autonamed/MyAutoNameFactory.java
@@ -4,7 +4,7 @@ import io.avaje.inject.Bean;
 import io.avaje.inject.Factory;
 import org.example.iface.Some;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 @Factory
 public class MyAutoNameFactory {
diff --git a/inject-test/src/test/java/org/example/circular/Cupholder.java b/inject-test/src/test/java/org/example/circular/Cupholder.java
index e69da907..20bb0515 100644
--- a/inject-test/src/test/java/org/example/circular/Cupholder.java
+++ b/inject-test/src/test/java/org/example/circular/Cupholder.java
@@ -1,8 +1,8 @@
 package org.example.circular;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class Cupholder {
diff --git a/inject-test/src/test/java/org/example/circular/Seat.java b/inject-test/src/test/java/org/example/circular/Seat.java
index 80129d61..79f59d32 100644
--- a/inject-test/src/test/java/org/example/circular/Seat.java
+++ b/inject-test/src/test/java/org/example/circular/Seat.java
@@ -1,7 +1,7 @@
 package org.example.circular;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class Seat {
diff --git a/inject-test/src/test/java/org/example/closable/ShouldCloseAuto.java b/inject-test/src/test/java/org/example/closable/ShouldCloseAuto.java
index 6034ec53..30abc7a7 100644
--- a/inject-test/src/test/java/org/example/closable/ShouldCloseAuto.java
+++ b/inject-test/src/test/java/org/example/closable/ShouldCloseAuto.java
@@ -1,6 +1,6 @@
 package org.example.closable;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import java.io.Closeable;
 
diff --git a/inject-test/src/test/java/org/example/closable/ShouldCloseAuto2.java b/inject-test/src/test/java/org/example/closable/ShouldCloseAuto2.java
index 10850b73..a9d01336 100644
--- a/inject-test/src/test/java/org/example/closable/ShouldCloseAuto2.java
+++ b/inject-test/src/test/java/org/example/closable/ShouldCloseAuto2.java
@@ -1,6 +1,6 @@
 package org.example.closable;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class ShouldCloseAuto2 implements AutoCloseable {
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 718a3d43..79adbd10 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;
 
 //@InjectModule(name = "coffee-maker", requires = Object.class)
 @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 75a12852..20d7932a 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 29018256..a8ac3df3 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;
 import org.example.coffee.parent.DesEngi;
 
 import java.io.Closeable;
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 15c48b9c..84215c72 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 8b33f4e5..e821676f 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 09747aef..9a48fc81 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
 public 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 ae9bcfe3..4dbffd48 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;
 
 import java.util.Objects;
 
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 16202dbc..51a09dab 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.PostConstruct;
 import io.avaje.inject.PreDestroy;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class AMusher {
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/inner/InnerClassBean.java b/inject-test/src/test/java/org/example/coffee/inner/InnerClassBean.java
index 02256c2b..9df3d9f2 100644
--- a/inject-test/src/test/java/org/example/coffee/inner/InnerClassBean.java
+++ b/inject-test/src/test/java/org/example/coffee/inner/InnerClassBean.java
@@ -1,6 +1,6 @@
 package org.example.coffee.inner;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 public class InnerClassBean {
   @Singleton
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/list/SomeInterfaceConsumer.java b/inject-test/src/test/java/org/example/coffee/list/SomeInterfaceConsumer.java
index 7348c54c..63daf8f6 100644
--- a/inject-test/src/test/java/org/example/coffee/list/SomeInterfaceConsumer.java
+++ b/inject-test/src/test/java/org/example/coffee/list/SomeInterfaceConsumer.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;
 
diff --git a/inject-test/src/test/java/org/example/coffee/parent/DesEngi.java b/inject-test/src/test/java/org/example/coffee/parent/DesEngi.java
index bb54cabc..ee5016fa 100644
--- a/inject-test/src/test/java/org/example/coffee/parent/DesEngi.java
+++ b/inject-test/src/test/java/org/example/coffee/parent/DesEngi.java
@@ -1,6 +1,6 @@
 package org.example.coffee.parent;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import org.example.coffee.parent.sub.Engi;
 
 @Singleton
diff --git a/inject-test/src/test/java/org/example/coffee/parent/LightPetEngi.java b/inject-test/src/test/java/org/example/coffee/parent/LightPetEngi.java
index 86ac0499..68c786f6 100644
--- a/inject-test/src/test/java/org/example/coffee/parent/LightPetEngi.java
+++ b/inject-test/src/test/java/org/example/coffee/parent/LightPetEngi.java
@@ -1,7 +1,7 @@
 package org.example.coffee.parent;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import org.example.coffee.parent.sub.PetEngi;
 
 @Named("Lite")
diff --git a/inject-test/src/test/java/org/example/coffee/parent/NoImpliedNameEngi.java b/inject-test/src/test/java/org/example/coffee/parent/NoImpliedNameEngi.java
index 2ce1f188..e8c77ab2 100644
--- a/inject-test/src/test/java/org/example/coffee/parent/NoImpliedNameEngi.java
+++ b/inject-test/src/test/java/org/example/coffee/parent/NoImpliedNameEngi.java
@@ -1,6 +1,6 @@
 package org.example.coffee.parent;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import org.example.coffee.parent.sub.PetEngi;
 
 /**
diff --git a/inject-test/src/test/java/org/example/coffee/parent/PowerPetEngi.java b/inject-test/src/test/java/org/example/coffee/parent/PowerPetEngi.java
index 29172b8f..5836443e 100644
--- a/inject-test/src/test/java/org/example/coffee/parent/PowerPetEngi.java
+++ b/inject-test/src/test/java/org/example/coffee/parent/PowerPetEngi.java
@@ -1,6 +1,6 @@
 package org.example.coffee.parent;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import org.example.coffee.parent.sub.PetEngi;
 
 @Singleton
diff --git a/inject-test/src/test/java/org/example/coffee/parent/Silly.java b/inject-test/src/test/java/org/example/coffee/parent/Silly.java
index 47a505a1..c528e819 100644
--- a/inject-test/src/test/java/org/example/coffee/parent/Silly.java
+++ b/inject-test/src/test/java/org/example/coffee/parent/Silly.java
@@ -1,6 +1,6 @@
 package org.example.coffee.parent;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class Silly {
diff --git a/inject-test/src/test/java/org/example/coffee/parent/SuperSilly.java b/inject-test/src/test/java/org/example/coffee/parent/SuperSilly.java
index 2a532cfe..42af375f 100644
--- a/inject-test/src/test/java/org/example/coffee/parent/SuperSilly.java
+++ b/inject-test/src/test/java/org/example/coffee/parent/SuperSilly.java
@@ -1,6 +1,6 @@
 package org.example.coffee.parent;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class SuperSilly extends Silly {
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/UseNamedPEmailer.java b/inject-test/src/test/java/org/example/coffee/primary/UseNamedPEmailer.java
index 64ade922..3c122c5d 100644
--- a/inject-test/src/test/java/org/example/coffee/primary/UseNamedPEmailer.java
+++ b/inject-test/src/test/java/org/example/coffee/primary/UseNamedPEmailer.java
@@ -1,7 +1,7 @@
 package org.example.coffee.primary;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class UseNamedPEmailer {
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/prototype/ExtraProto.java b/inject-test/src/test/java/org/example/coffee/prototype/ExtraProto.java
index def3fa5b..c89169b3 100644
--- a/inject-test/src/test/java/org/example/coffee/prototype/ExtraProto.java
+++ b/inject-test/src/test/java/org/example/coffee/prototype/ExtraProto.java
@@ -2,7 +2,7 @@ package org.example.coffee.prototype;
 
 import io.avaje.inject.PostConstruct;
 import io.avaje.inject.Prototype;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/inject-test/src/test/java/org/example/coffee/prototype/UseProto.java b/inject-test/src/test/java/org/example/coffee/prototype/UseProto.java
index 9bf17e34..14227e53 100644
--- a/inject-test/src/test/java/org/example/coffee/prototype/UseProto.java
+++ b/inject-test/src/test/java/org/example/coffee/prototype/UseProto.java
@@ -1,7 +1,7 @@
 package org.example.coffee.prototype;
 
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class UseProto {
diff --git a/inject-test/src/test/java/org/example/coffee/prototype/UseProto2.java b/inject-test/src/test/java/org/example/coffee/prototype/UseProto2.java
index b0c61615..05acd7ac 100644
--- a/inject-test/src/test/java/org/example/coffee/prototype/UseProto2.java
+++ b/inject-test/src/test/java/org/example/coffee/prototype/UseProto2.java
@@ -1,6 +1,6 @@
 package org.example.coffee.prototype;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class UseProto2 {
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/FieldInjectProvider.java b/inject-test/src/test/java/org/example/coffee/provider/FieldInjectProvider.java
index 2783997b..b0e9b56b 100644
--- a/inject-test/src/test/java/org/example/coffee/provider/FieldInjectProvider.java
+++ b/inject-test/src/test/java/org/example/coffee/provider/FieldInjectProvider.java
@@ -1,8 +1,8 @@
 package org.example.coffee.provider;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
 
 @Singleton
 class FieldInjectProvider {
diff --git a/inject-test/src/test/java/org/example/coffee/provider/MethodInjectProvider.java b/inject-test/src/test/java/org/example/coffee/provider/MethodInjectProvider.java
index 181b7101..654bb9b0 100644
--- a/inject-test/src/test/java/org/example/coffee/provider/MethodInjectProvider.java
+++ b/inject-test/src/test/java/org/example/coffee/provider/MethodInjectProvider.java
@@ -1,8 +1,8 @@
 package org.example.coffee.provider;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
 
 @Singleton
 class MethodInjectProvider {
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/FooQual.java b/inject-test/src/test/java/org/example/coffee/qualifier/FooQual.java
index d7832c5d..d9dbb971 100644
--- a/inject-test/src/test/java/org/example/coffee/qualifier/FooQual.java
+++ b/inject-test/src/test/java/org/example/coffee/qualifier/FooQual.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;
 
 /**
  * Named with empty string.
diff --git a/inject-test/src/test/java/org/example/coffee/qualifier/Green.java b/inject-test/src/test/java/org/example/coffee/qualifier/Green.java
index 7f51c063..8566df5e 100644
--- a/inject-test/src/test/java/org/example/coffee/qualifier/Green.java
+++ b/inject-test/src/test/java/org/example/coffee/qualifier/Green.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/GreenStore.java b/inject-test/src/test/java/org/example/coffee/qualifier/GreenStore.java
index ed4862a0..ae23b9ec 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;
 
 @Green
 @Singleton
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/qualifier/StoreManagerWithSetterQualifier.java b/inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithSetterQualifier.java
index d6324265..6b4ecafe 100644
--- a/inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithSetterQualifier.java
+++ b/inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithSetterQualifier.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 StoreManagerWithSetterQualifier {
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 c3ad0f2d..356e033d 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,7 +1,7 @@
 package org.example.coffee.secondary;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class WidgetUser {
diff --git a/inject-test/src/test/java/org/example/custom/CustomBean.java b/inject-test/src/test/java/org/example/custom/CustomBean.java
index a70bdea1..f02c7da4 100644
--- a/inject-test/src/test/java/org/example/custom/CustomBean.java
+++ b/inject-test/src/test/java/org/example/custom/CustomBean.java
@@ -1,6 +1,6 @@
 package org.example.custom;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import org.example.MyCustomScope;
 
 @Named("Hello")
diff --git a/inject-test/src/test/java/org/example/custom2/OcsTwo.java b/inject-test/src/test/java/org/example/custom2/OcsTwo.java
index 5386561d..33720541 100644
--- a/inject-test/src/test/java/org/example/custom2/OcsTwo.java
+++ b/inject-test/src/test/java/org/example/custom2/OcsTwo.java
@@ -1,6 +1,6 @@
 package org.example.custom2;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 @Named("two")
 @OciMarker
diff --git a/inject-test/src/test/java/org/example/custom2/OtherScope.java b/inject-test/src/test/java/org/example/custom2/OtherScope.java
index 90472fcd..23bbde40 100644
--- a/inject-test/src/test/java/org/example/custom2/OtherScope.java
+++ b/inject-test/src/test/java/org/example/custom2/OtherScope.java
@@ -1,6 +1,6 @@
 package org.example.custom2;
 
-import javax.inject.Scope;
+import jakarta.inject.Scope;
 
 @Scope
 public @interface OtherScope {
diff --git a/inject-test/src/test/java/org/example/custom3/MyThreeScope.java b/inject-test/src/test/java/org/example/custom3/MyThreeScope.java
index c337b44a..68be8a21 100644
--- a/inject-test/src/test/java/org/example/custom3/MyThreeScope.java
+++ b/inject-test/src/test/java/org/example/custom3/MyThreeScope.java
@@ -1,7 +1,7 @@
 package org.example.custom3;
 
 import io.avaje.inject.InjectModule;
-import javax.inject.Scope;
+import jakarta.inject.Scope;
 import org.example.custom2.OtherScope;
 
 /**
diff --git a/inject-test/src/test/java/org/example/custom3/TcsArt.java b/inject-test/src/test/java/org/example/custom3/TcsArt.java
index 1b049f42..dfd1eeca 100644
--- a/inject-test/src/test/java/org/example/custom3/TcsArt.java
+++ b/inject-test/src/test/java/org/example/custom3/TcsArt.java
@@ -1,6 +1,6 @@
 package org.example.custom3;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @MyThreeScope
 @Singleton
diff --git a/inject-test/src/test/java/org/example/custom4/BuildScope.java b/inject-test/src/test/java/org/example/custom4/BuildScope.java
index 0ebd8764..ef5bbc9d 100644
--- a/inject-test/src/test/java/org/example/custom4/BuildScope.java
+++ b/inject-test/src/test/java/org/example/custom4/BuildScope.java
@@ -1,7 +1,7 @@
 package org.example.custom4;
 
 import io.avaje.inject.InjectModule;
-import javax.inject.Scope;
+import jakarta.inject.Scope;
 
 @Scope
 @InjectModule(requires = Build.class )
diff --git a/inject-test/src/test/java/org/example/custom4/IntentionallyEmptyScope.java b/inject-test/src/test/java/org/example/custom4/IntentionallyEmptyScope.java
index 981b34c2..45ed4ec4 100644
--- a/inject-test/src/test/java/org/example/custom4/IntentionallyEmptyScope.java
+++ b/inject-test/src/test/java/org/example/custom4/IntentionallyEmptyScope.java
@@ -1,7 +1,7 @@
 package org.example.custom4;
 
 import io.avaje.inject.InjectModule;
-import javax.inject.Scope;
+import jakarta.inject.Scope;
 
 @Scope
 @InjectModule(requires = BuildScope.class )
diff --git a/inject-test/src/test/java/org/example/custom4/LinuxScope.java b/inject-test/src/test/java/org/example/custom4/LinuxScope.java
index 41b92b46..701efd6d 100644
--- a/inject-test/src/test/java/org/example/custom4/LinuxScope.java
+++ b/inject-test/src/test/java/org/example/custom4/LinuxScope.java
@@ -1,7 +1,7 @@
 package org.example.custom4;
 
 import io.avaje.inject.InjectModule;
-import javax.inject.Scope;
+import jakarta.inject.Scope;
 
 @Scope
 @InjectModule(requires = {MachineScope.class})
diff --git a/inject-test/src/test/java/org/example/custom4/MachineScope.java b/inject-test/src/test/java/org/example/custom4/MachineScope.java
index 9a85742d..3a04ef39 100644
--- a/inject-test/src/test/java/org/example/custom4/MachineScope.java
+++ b/inject-test/src/test/java/org/example/custom4/MachineScope.java
@@ -1,7 +1,7 @@
 package org.example.custom4;
 
 import io.avaje.inject.InjectModule;
-import javax.inject.Scope;
+import jakarta.inject.Scope;
 
 @Scope
 @InjectModule(requires = {Machine.class, IntentionallyEmptyScope.class})
diff --git a/inject-test/src/test/java/org/example/customext0/Ext0Scope.java b/inject-test/src/test/java/org/example/customext0/Ext0Scope.java
index 06d1551a..635aacd1 100644
--- a/inject-test/src/test/java/org/example/customext0/Ext0Scope.java
+++ b/inject-test/src/test/java/org/example/customext0/Ext0Scope.java
@@ -1,7 +1,7 @@
 package org.example.customext0;
 
 import io.avaje.inject.InjectModule;
-import javax.inject.Scope;
+import jakarta.inject.Scope;
 
 @Scope
 @InjectModule(requires = {Ext0iface.class, Ext0conc.class})
diff --git a/inject-test/src/test/java/org/example/customext1/Ext1Scope.java b/inject-test/src/test/java/org/example/customext1/Ext1Scope.java
index 8b2f7c1e..aa394d28 100644
--- a/inject-test/src/test/java/org/example/customext1/Ext1Scope.java
+++ b/inject-test/src/test/java/org/example/customext1/Ext1Scope.java
@@ -1,7 +1,7 @@
 package org.example.customext1;
 
 import io.avaje.inject.InjectModule;
-import javax.inject.Scope;
+import jakarta.inject.Scope;
 import org.example.customext0.Ext0Scope;
 
 @Scope
diff --git a/inject-test/src/test/java/org/example/generic/PathBuildTask.java b/inject-test/src/test/java/org/example/generic/PathBuildTask.java
index 4d001c9f..93c54711 100644
--- a/inject-test/src/test/java/org/example/generic/PathBuildTask.java
+++ b/inject-test/src/test/java/org/example/generic/PathBuildTask.java
@@ -1,6 +1,6 @@
 package org.example.generic;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import java.nio.file.Path;
 
diff --git a/inject-test/src/test/java/org/example/iface/ConcreteExtend.java b/inject-test/src/test/java/org/example/iface/ConcreteExtend.java
index b3c04c1b..38fec205 100644
--- a/inject-test/src/test/java/org/example/iface/ConcreteExtend.java
+++ b/inject-test/src/test/java/org/example/iface/ConcreteExtend.java
@@ -1,6 +1,6 @@
 package org.example.iface;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class ConcreteExtend implements IfaceExtend {
diff --git a/inject-test/src/test/java/org/example/iface/MyParam.java b/inject-test/src/test/java/org/example/iface/MyParam.java
index 2578f7e6..71ed79a8 100644
--- a/inject-test/src/test/java/org/example/iface/MyParam.java
+++ b/inject-test/src/test/java/org/example/iface/MyParam.java
@@ -1,7 +1,7 @@
 package org.example.iface;
 
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class MyParam<T> implements IfaceParam<T> {
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/inherit/InhBase.java b/inject-test/src/test/java/org/example/inherit/InhBase.java
index bf63ea52..4783fe72 100644
--- a/inject-test/src/test/java/org/example/inherit/InhBase.java
+++ b/inject-test/src/test/java/org/example/inherit/InhBase.java
@@ -1,6 +1,6 @@
 package org.example.inherit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.example.coffee.core.Steamer;
 
 public class InhBase extends InhBaseBase implements InhBaseIface2 {
diff --git a/inject-test/src/test/java/org/example/inherit/InhBaseBase.java b/inject-test/src/test/java/org/example/inherit/InhBaseBase.java
index e427bfad..a2a432c9 100644
--- a/inject-test/src/test/java/org/example/inherit/InhBaseBase.java
+++ b/inject-test/src/test/java/org/example/inherit/InhBaseBase.java
@@ -1,6 +1,6 @@
 package org.example.inherit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.example.coffee.core.Steamer;
 
 public class InhBaseBase implements InhBaseIface {
diff --git a/inject-test/src/test/java/org/example/inherit/InhOne.java b/inject-test/src/test/java/org/example/inherit/InhOne.java
index 2a8df28b..4e83ae42 100644
--- a/inject-test/src/test/java/org/example/inherit/InhOne.java
+++ b/inject-test/src/test/java/org/example/inherit/InhOne.java
@@ -1,7 +1,7 @@
 package org.example.inherit;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import org.example.coffee.core.Steamer;
 
 @Singleton
diff --git a/inject-test/src/test/java/org/example/inheritprovides/Application.java b/inject-test/src/test/java/org/example/inheritprovides/Application.java
index 57a33884..553829c4 100644
--- a/inject-test/src/test/java/org/example/inheritprovides/Application.java
+++ b/inject-test/src/test/java/org/example/inheritprovides/Application.java
@@ -1,7 +1,7 @@
 package org.example.inheritprovides;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.util.List;
 
 @Singleton
diff --git a/inject-test/src/test/java/org/example/inheritprovides/Controller1.java b/inject-test/src/test/java/org/example/inheritprovides/Controller1.java
index 02240216..88204e8c 100644
--- a/inject-test/src/test/java/org/example/inheritprovides/Controller1.java
+++ b/inject-test/src/test/java/org/example/inheritprovides/Controller1.java
@@ -1,6 +1,6 @@
 package org.example.inheritprovides;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.util.Map;
 
 @Singleton
diff --git a/inject-test/src/test/java/org/example/inheritprovides/Controller2.java b/inject-test/src/test/java/org/example/inheritprovides/Controller2.java
index bd986020..d94c63e6 100644
--- a/inject-test/src/test/java/org/example/inheritprovides/Controller2.java
+++ b/inject-test/src/test/java/org/example/inheritprovides/Controller2.java
@@ -1,6 +1,6 @@
 package org.example.inheritprovides;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import java.util.Map;
 
diff --git a/inject-test/src/test/java/org/example/injectextension/WithExtnBasicTest.java b/inject-test/src/test/java/org/example/injectextension/WithExtnBasicTest.java
index f3755cc5..7e0d34ac 100644
--- a/inject-test/src/test/java/org/example/injectextension/WithExtnBasicTest.java
+++ b/inject-test/src/test/java/org/example/injectextension/WithExtnBasicTest.java
@@ -1,7 +1,7 @@
 package org.example.injectextension;
 
 import io.avaje.inject.test.InjectExtension;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.example.coffee.CoffeeMaker;
 import org.example.coffee.Pump;
 import org.example.coffee.grind.Grinder;
diff --git a/inject-test/src/test/java/org/example/injectextension/WithExtnCaptorTest.java b/inject-test/src/test/java/org/example/injectextension/WithExtnCaptorTest.java
index fceff229..298c1435 100644
--- a/inject-test/src/test/java/org/example/injectextension/WithExtnCaptorTest.java
+++ b/inject-test/src/test/java/org/example/injectextension/WithExtnCaptorTest.java
@@ -1,7 +1,7 @@
 package org.example.injectextension;
 
 import io.avaje.inject.test.InjectExtension;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.example.coffee.fruit.AppleService;
 import org.example.coffee.fruit.PeachService;
 import org.junit.jupiter.api.Test;
diff --git a/inject-test/src/test/java/org/example/injectextension/WithExtnNamedMocksTest.java b/inject-test/src/test/java/org/example/injectextension/WithExtnNamedMocksTest.java
index 2c6b499e..191f747f 100644
--- a/inject-test/src/test/java/org/example/injectextension/WithExtnNamedMocksTest.java
+++ b/inject-test/src/test/java/org/example/injectextension/WithExtnNamedMocksTest.java
@@ -2,8 +2,8 @@ package org.example.injectextension;
 
 import io.avaje.inject.BeanScope;
 import io.avaje.inject.test.InjectExtension;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import org.example.coffee.qualifier.Blue;
 import org.example.coffee.qualifier.SomeStore;
 import org.example.coffee.qualifier.StoreManagerWithSetterQualifier;
diff --git a/inject-test/src/test/java/org/example/injectextension/WithExtnNamedSpyTest.java b/inject-test/src/test/java/org/example/injectextension/WithExtnNamedSpyTest.java
index 55160c8c..e2a59aee 100644
--- a/inject-test/src/test/java/org/example/injectextension/WithExtnNamedSpyTest.java
+++ b/inject-test/src/test/java/org/example/injectextension/WithExtnNamedSpyTest.java
@@ -2,8 +2,8 @@ package org.example.injectextension;
 
 import io.avaje.inject.BeanScope;
 import io.avaje.inject.test.InjectExtension;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import org.example.coffee.qualifier.Blue;
 import org.example.coffee.qualifier.SomeStore;
 import org.example.coffee.qualifier.StoreManagerWithSetterQualifier;
diff --git a/inject-test/src/test/java/org/example/injectextension/WithExtnPrivateFieldsTest.java b/inject-test/src/test/java/org/example/injectextension/WithExtnPrivateFieldsTest.java
index 4cd85e63..552bbd05 100644
--- a/inject-test/src/test/java/org/example/injectextension/WithExtnPrivateFieldsTest.java
+++ b/inject-test/src/test/java/org/example/injectextension/WithExtnPrivateFieldsTest.java
@@ -1,7 +1,7 @@
 package org.example.injectextension;
 
 import io.avaje.inject.test.InjectExtension;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.example.coffee.CoffeeMaker;
 import org.example.coffee.Pump;
 import org.example.coffee.grind.Grinder;
diff --git a/inject-test/src/test/java/org/example/missing/MFoo.java b/inject-test/src/test/java/org/example/missing/MFoo.java
index 5f161a60..e566b012 100644
--- a/inject-test/src/test/java/org/example/missing/MFoo.java
+++ b/inject-test/src/test/java/org/example/missing/MFoo.java
@@ -1,6 +1,6 @@
 package org.example.missing;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton // improve error when @Singleton missing
 public class MFoo {
diff --git a/inject-test/src/test/java/org/example/missing/MFooUser.java b/inject-test/src/test/java/org/example/missing/MFooUser.java
index fcd4c685..aca08335 100644
--- a/inject-test/src/test/java/org/example/missing/MFooUser.java
+++ b/inject-test/src/test/java/org/example/missing/MFooUser.java
@@ -1,6 +1,6 @@
 package org.example.missing;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class MFooUser {
diff --git a/inject-test/src/test/java/org/example/missing/MFooUser2.java b/inject-test/src/test/java/org/example/missing/MFooUser2.java
index 3800cfe7..b6b6b3c8 100644
--- a/inject-test/src/test/java/org/example/missing/MFooUser2.java
+++ b/inject-test/src/test/java/org/example/missing/MFooUser2.java
@@ -1,6 +1,6 @@
 package org.example.missing;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 /**
  * Has only 1 public constructor so that is chosen for injection.
diff --git a/inject-test/src/test/java/org/example/missing/MFooUserMore.java b/inject-test/src/test/java/org/example/missing/MFooUserMore.java
index 343afc75..4ff5b7c8 100644
--- a/inject-test/src/test/java/org/example/missing/MFooUserMore.java
+++ b/inject-test/src/test/java/org/example/missing/MFooUserMore.java
@@ -1,6 +1,6 @@
 package org.example.missing;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class MFooUserMore {
diff --git a/inject-test/src/test/java/org/example/optional/AllQue.java b/inject-test/src/test/java/org/example/optional/AllQue.java
index ddd8695b..02000dac 100644
--- a/inject-test/src/test/java/org/example/optional/AllQue.java
+++ b/inject-test/src/test/java/org/example/optional/AllQue.java
@@ -1,7 +1,7 @@
 package org.example.optional;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 import java.util.Optional;
 
diff --git a/inject-test/src/test/java/org/example/optional/AllQue2.java b/inject-test/src/test/java/org/example/optional/AllQue2.java
index 3468c66d..6913b17f 100644
--- a/inject-test/src/test/java/org/example/optional/AllQue2.java
+++ b/inject-test/src/test/java/org/example/optional/AllQue2.java
@@ -1,8 +1,8 @@
 package org.example.optional;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 import java.util.Optional;
 
diff --git a/inject-test/src/test/java/org/example/optional/AllQue3.java b/inject-test/src/test/java/org/example/optional/AllQue3.java
index 4c402708..4373b124 100644
--- a/inject-test/src/test/java/org/example/optional/AllQue3.java
+++ b/inject-test/src/test/java/org/example/optional/AllQue3.java
@@ -1,8 +1,8 @@
 package org.example.optional;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 import java.util.Optional;
 
diff --git a/inject-test/src/test/java/org/example/optional/AllQue4.java b/inject-test/src/test/java/org/example/optional/AllQue4.java
index e78fe67b..ae6cea99 100644
--- a/inject-test/src/test/java/org/example/optional/AllQue4.java
+++ b/inject-test/src/test/java/org/example/optional/AllQue4.java
@@ -1,8 +1,8 @@
 package org.example.optional;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 import javax.annotation.Nullable;
 
diff --git a/inject-test/src/test/java/org/example/optional/AllQue5.java b/inject-test/src/test/java/org/example/optional/AllQue5.java
index 97614e13..805d1896 100644
--- a/inject-test/src/test/java/org/example/optional/AllQue5.java
+++ b/inject-test/src/test/java/org/example/optional/AllQue5.java
@@ -1,7 +1,7 @@
 package org.example.optional;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import org.jetbrains.annotations.Nullable;
 
 /**
diff --git a/inject-test/src/test/java/org/example/optional/AllQue6.java b/inject-test/src/test/java/org/example/optional/AllQue6.java
index b39d7f00..51b3c3ef 100644
--- a/inject-test/src/test/java/org/example/optional/AllQue6.java
+++ b/inject-test/src/test/java/org/example/optional/AllQue6.java
@@ -1,8 +1,8 @@
 package org.example.optional;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 import javax.annotation.Nullable;
 
diff --git a/inject-test/src/test/java/org/example/optional/NoImpUser.java b/inject-test/src/test/java/org/example/optional/NoImpUser.java
index ae079bdb..288ef17d 100644
--- a/inject-test/src/test/java/org/example/optional/NoImpUser.java
+++ b/inject-test/src/test/java/org/example/optional/NoImpUser.java
@@ -1,6 +1,6 @@
 package org.example.optional;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import org.jetbrains.annotations.Nullable;
 
 @Singleton
diff --git a/inject-test/src/test/java/org/example/optional/NoImpUser2.java b/inject-test/src/test/java/org/example/optional/NoImpUser2.java
index 8cc3ceca..53d6ecc9 100644
--- a/inject-test/src/test/java/org/example/optional/NoImpUser2.java
+++ b/inject-test/src/test/java/org/example/optional/NoImpUser2.java
@@ -1,7 +1,7 @@
 package org.example.optional;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import org.jetbrains.annotations.Nullable;
 
 @Singleton
diff --git a/inject-test/src/test/java/org/example/optional/OFooBar.java b/inject-test/src/test/java/org/example/optional/OFooBar.java
index a4446c6b..d4529fc7 100644
--- a/inject-test/src/test/java/org/example/optional/OFooBar.java
+++ b/inject-test/src/test/java/org/example/optional/OFooBar.java
@@ -1,7 +1,7 @@
 package org.example.optional;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class OFooBar {
diff --git a/inject-test/src/test/java/org/example/optional/OFooBazz.java b/inject-test/src/test/java/org/example/optional/OFooBazz.java
index f214cb0a..a526eb3b 100644
--- a/inject-test/src/test/java/org/example/optional/OFooBazz.java
+++ b/inject-test/src/test/java/org/example/optional/OFooBazz.java
@@ -1,7 +1,7 @@
 package org.example.optional;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class OFooBazz {
diff --git a/inject-test/src/test/java/org/example/optional/OFooDefaultBar.java b/inject-test/src/test/java/org/example/optional/OFooDefaultBar.java
index 3eaa1f30..fa439931 100644
--- a/inject-test/src/test/java/org/example/optional/OFooDefaultBar.java
+++ b/inject-test/src/test/java/org/example/optional/OFooDefaultBar.java
@@ -1,8 +1,8 @@
 package org.example.optional;
 
 import io.avaje.inject.Secondary;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 @Named("forBar")
 @Singleton
diff --git a/inject-test/src/test/java/org/example/optional/OFooDefaultBazz.java b/inject-test/src/test/java/org/example/optional/OFooDefaultBazz.java
index bff7fa75..54bedc6d 100644
--- a/inject-test/src/test/java/org/example/optional/OFooDefaultBazz.java
+++ b/inject-test/src/test/java/org/example/optional/OFooDefaultBazz.java
@@ -1,8 +1,8 @@
 package org.example.optional;
 
 import io.avaje.inject.Secondary;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 @Named("forBazz")
 @Singleton
diff --git a/inject-test/src/test/java/org/example/optional/OptBax.java b/inject-test/src/test/java/org/example/optional/OptBax.java
index 78195733..1f98dc63 100644
--- a/inject-test/src/test/java/org/example/optional/OptBax.java
+++ b/inject-test/src/test/java/org/example/optional/OptBax.java
@@ -1,7 +1,7 @@
 package org.example.optional;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 import java.util.Optional;
 
diff --git a/inject-test/src/test/java/org/example/optional/OptDefaultBax.java b/inject-test/src/test/java/org/example/optional/OptDefaultBax.java
index 94f85bc9..7d26ecea 100644
--- a/inject-test/src/test/java/org/example/optional/OptDefaultBax.java
+++ b/inject-test/src/test/java/org/example/optional/OptDefaultBax.java
@@ -1,8 +1,8 @@
 package org.example.optional;
 
 import io.avaje.inject.Secondary;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Named("default")
diff --git a/inject-test/src/test/java/org/example/optional/OptDefaultBazz.java b/inject-test/src/test/java/org/example/optional/OptDefaultBazz.java
index 89ab632e..ebdbcee3 100644
--- a/inject-test/src/test/java/org/example/optional/OptDefaultBazz.java
+++ b/inject-test/src/test/java/org/example/optional/OptDefaultBazz.java
@@ -1,8 +1,8 @@
 package org.example.optional;
 
 import io.avaje.inject.Secondary;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Named("defaultBazz")
diff --git a/inject-test/src/test/java/org/example/optional/OptFactory.java b/inject-test/src/test/java/org/example/optional/OptFactory.java
index 4184a203..a3bb7aa9 100644
--- a/inject-test/src/test/java/org/example/optional/OptFactory.java
+++ b/inject-test/src/test/java/org/example/optional/OptFactory.java
@@ -2,7 +2,7 @@ package org.example.optional;
 
 import io.avaje.inject.Bean;
 import io.avaje.inject.Factory;
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import java.util.Optional;
 
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 {