Move to Jakarta

smallrye · Jan 25, 2023 · 531655a · 531655a
1 parent dd17e2c
commit 531655a
Show file tree

Hide file tree

Showing 61 changed files with 223 additions and 216 deletions.
diff --git a/.github/project.yml b/.github/project.yml
@@ -1,4 +1,4 @@
 name: SmallRye JWT
 release:
-  current-version: 3.6.1
-  next-version: 3.6.2-SNAPSHOT
+  current-version: 4.0.0
+  next-version: 4.1.0-SNAPSHOT
diff --git a/coverage/pom.xml b/coverage/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-jwt-parent</artifactId>
-        <version>3.6.2-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-jwt-coverage</artifactId>

diff --git a/implementation/common/pom.xml b/implementation/common/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>io.smallrye</groupId>
     <artifactId>smallrye-jwt-implementation-parent</artifactId>
-    <version>3.6.2-SNAPSHOT</version>
+    <version>4.0.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>smallrye-jwt-common</artifactId>

diff --git a/implementation/common/src/main/java/io/smallrye/jwt/util/KeyUtils.java b/implementation/common/src/main/java/io/smallrye/jwt/util/KeyUtils.java
@@ -47,10 +47,11 @@
 
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
+
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
 
 import org.jose4j.json.JsonUtil;
 import org.jose4j.jwk.JsonWebKey;

diff --git a/implementation/jwt-auth/pom.xml b/implementation/jwt-auth/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>io.smallrye</groupId>
     <artifactId>smallrye-jwt-implementation-parent</artifactId>
-    <version>3.6.2-SNAPSHOT</version>
+    <version>4.0.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>smallrye-jwt</artifactId>

diff --git a/implementation/jwt-auth/src/main/java/io/smallrye/jwt/JsonUtils.java b/implementation/jwt-auth/src/main/java/io/smallrye/jwt/JsonUtils.java
@@ -6,14 +6,14 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonNumber;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonString;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
 
 public class JsonUtils {
 

diff --git a/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/CDILogging.java b/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/CDILogging.java
@@ -2,9 +2,9 @@
 
 import java.util.Optional;
 
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionPoint;
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;

diff --git a/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/CDIMessages.java b/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/CDIMessages.java
@@ -1,7 +1,7 @@
 package io.smallrye.jwt.auth.cdi;
 
-import javax.enterprise.inject.spi.DeploymentException;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.DeploymentException;
+import jakarta.enterprise.inject.spi.InjectionPoint;
 
 import org.jboss.logging.Messages;
 import org.jboss.logging.annotations.Message;

diff --git a/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/ClaimValueProducer.java b/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/ClaimValueProducer.java
@@ -17,10 +17,10 @@
 
 package io.smallrye.jwt.auth.cdi;
 
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.inject.Inject;
 
 import org.eclipse.microprofile.jwt.Claim;
 import org.eclipse.microprofile.jwt.ClaimValue;

diff --git a/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/ClaimValueWrapper.java b/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/ClaimValueWrapper.java
@@ -22,9 +22,9 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.json.JsonValue;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.json.JsonValue;
 
 import org.eclipse.microprofile.jwt.ClaimValue;
 

diff --git a/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/CommonJwtProducer.java b/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/CommonJwtProducer.java
@@ -19,10 +19,10 @@
 import java.lang.annotation.Annotation;
 import java.util.Optional;
 
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.inject.Inject;
-import javax.json.JsonValue;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.inject.Inject;
+import jakarta.json.JsonValue;
 
 import org.eclipse.microprofile.jwt.Claim;
 import org.eclipse.microprofile.jwt.Claims;

diff --git a/...on/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/JWTCallerPrincipalFactoryProducer.java b/...on/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/JWTCallerPrincipalFactoryProducer.java
@@ -16,8 +16,8 @@
  */
 package io.smallrye.jwt.auth.cdi;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
 
 import io.smallrye.jwt.auth.principal.JWTCallerPrincipalFactory;
 

diff --git a/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/JsonValueProducer.java b/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/JsonValueProducer.java
@@ -19,14 +19,14 @@
 
 import java.util.Optional;
 
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.inject.Inject;
-import javax.json.JsonArray;
-import javax.json.JsonNumber;
-import javax.json.JsonObject;
-import javax.json.JsonString;
-import javax.json.JsonValue;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.inject.Inject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
 
 import org.eclipse.microprofile.jwt.Claim;
 

diff --git a/...ementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/OptionalClaimTypeProducer.java b/...ementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/OptionalClaimTypeProducer.java
@@ -5,9 +5,9 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.inject.Inject;
 
 import org.eclipse.microprofile.jwt.Claim;
 import org.eclipse.microprofile.jwt.JsonWebToken;

diff --git a/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/PrincipalProducer.java b/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/PrincipalProducer.java
@@ -16,10 +16,10 @@
  */
 package io.smallrye.jwt.auth.cdi;
 
-import javax.annotation.Priority;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Alternative;
-import javax.enterprise.inject.Produces;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Produces;
 
 import org.eclipse.microprofile.jwt.JsonWebToken;
 

diff --git a/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/ProviderExtensionSupport.java b/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/ProviderExtensionSupport.java
@@ -7,12 +7,12 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.ProcessBeanAttributes;
-import javax.enterprise.inject.spi.ProcessInjectionPoint;
-import javax.inject.Provider;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.ProcessBeanAttributes;
+import jakarta.enterprise.inject.spi.ProcessInjectionPoint;
+import jakarta.inject.Provider;
 
 import org.eclipse.microprofile.jwt.Claim;
 import org.eclipse.microprofile.jwt.Claims;
@@ -77,7 +77,7 @@ private static boolean isOptional(Type type) {
     }
 
     private static boolean isJson(Type type) {
-        return type.getTypeName().startsWith("javax.json.Json");
+        return type.getTypeName().startsWith("jakarta.json.Json");
     }
 
     private Set<Type> providerOptionalTypes = new HashSet<>();

diff --git a/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/RawClaimTypeProducer.java b/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/cdi/RawClaimTypeProducer.java
@@ -21,12 +21,12 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.inject.Inject;
-import javax.json.JsonNumber;
-import javax.json.JsonString;
-import javax.json.JsonValue;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.inject.Inject;
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
 
 import org.eclipse.microprofile.jwt.Claim;
 import org.eclipse.microprofile.jwt.Claims;

diff --git a/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/principal/DefaultJWTParser.java b/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/principal/DefaultJWTParser.java
@@ -23,8 +23,9 @@
 import java.security.interfaces.ECPublicKey;
 
 import javax.crypto.SecretKey;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.eclipse.microprofile.jwt.JsonWebToken;
 

diff --git a/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/principal/JWTCallerPrincipal.java b/implementation/jwt-auth/src/main/java/io/smallrye/jwt/auth/principal/JWTCallerPrincipal.java
@@ -20,9 +20,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.json.JsonValue;
 import javax.security.auth.Subject;
 
+import jakarta.json.JsonValue;
+
 import org.eclipse.microprofile.jwt.Claims;
 import org.eclipse.microprofile.jwt.JsonWebToken;
 

diff --git a/implementation/jwt-auth/src/main/java/io/smallrye/jwt/config/ConfigMessages.java b/implementation/jwt-auth/src/main/java/io/smallrye/jwt/config/ConfigMessages.java
@@ -1,6 +1,6 @@
 package io.smallrye.jwt.config;
 
-import javax.enterprise.inject.spi.DeploymentException;
+import jakarta.enterprise.inject.spi.DeploymentException;
 
 import org.jboss.logging.Messages;
 import org.jboss.logging.annotations.Cause;

diff --git a/implementation/jwt-auth/src/main/java/io/smallrye/jwt/config/JWTAuthContextInfoProvider.java b/implementation/jwt-auth/src/main/java/io/smallrye/jwt/config/JWTAuthContextInfoProvider.java
@@ -23,10 +23,10 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipse.microprofile.jwt.config.Names;

diff --git a/implementation/jwt-auth/src/test/java/io/smallrye/jwt/JsonUtilsTests.java b/implementation/jwt-auth/src/test/java/io/smallrye/jwt/JsonUtilsTests.java
@@ -16,18 +16,18 @@
  */
 package io.smallrye.jwt;
 
-import static javax.json.JsonValue.NULL;
+import static jakarta.json.JsonValue.NULL;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
 
 import org.junit.Test;
 

diff --git a/implementation/jwt-auth/src/test/java/io/smallrye/jwt/auth/cdi/ClaimInjectionTest.java b/implementation/jwt-auth/src/test/java/io/smallrye/jwt/auth/cdi/ClaimInjectionTest.java
@@ -7,16 +7,16 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.json.JsonArray;
-import javax.json.JsonNumber;
-import javax.json.JsonObject;
-import javax.json.JsonString;
-import javax.json.JsonValue;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
 
 import org.eclipse.microprofile.jwt.Claim;
 import org.eclipse.microprofile.jwt.ClaimValue;

diff --git a/implementation/jwt-auth/src/test/java/io/smallrye/jwt/auth/cdi/ClaimQualifier.java b/implementation/jwt-auth/src/test/java/io/smallrye/jwt/auth/cdi/ClaimQualifier.java
@@ -1,6 +1,6 @@
 package io.smallrye.jwt.auth.cdi;
 
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.AnnotationLiteral;
 
 import org.eclipse.microprofile.jwt.Claim;
 import org.eclipse.microprofile.jwt.Claims;

diff --git a/implementation/jwt-auth/src/test/java/io/smallrye/jwt/auth/cdi/ClaimValueProducerIT.java b/implementation/jwt-auth/src/test/java/io/smallrye/jwt/auth/cdi/ClaimValueProducerIT.java
@@ -9,7 +9,7 @@
 import java.util.NoSuchElementException;
 import java.util.Optional;
 
-import javax.enterprise.util.TypeLiteral;
+import jakarta.enterprise.util.TypeLiteral;
 
 import org.eclipse.microprofile.jwt.ClaimValue;
 import org.eclipse.microprofile.jwt.Claims;

diff --git a/.../jwt-auth/src/test/java/io/smallrye/jwt/auth/cdi/CustomJWTCallerPrincipalFactoryTest.java b/.../jwt-auth/src/test/java/io/smallrye/jwt/auth/cdi/CustomJWTCallerPrincipalFactoryTest.java
@@ -4,9 +4,9 @@
 
 import java.util.HashMap;
 
-import javax.annotation.Priority;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Alternative;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Alternative;
 
 import org.jboss.weld.context.bound.BoundRequestContext;
 import org.jboss.weld.junit4.WeldInitiator;

diff --git a/implementation/jwt-auth/src/test/java/io/smallrye/jwt/auth/cdi/JsonValueProducerTest.java b/implementation/jwt-auth/src/test/java/io/smallrye/jwt/auth/cdi/JsonValueProducerTest.java
@@ -7,8 +7,8 @@
 import java.util.HashMap;
 import java.util.Optional;
 
-import javax.json.JsonString;
-import javax.json.JsonValue;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
 
 import org.eclipse.microprofile.jwt.Claims;
 import org.eclipse.microprofile.jwt.JsonWebToken;

diff --git a/implementation/jwt-build/pom.xml b/implementation/jwt-build/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>io.smallrye</groupId>
     <artifactId>smallrye-jwt-implementation-parent</artifactId>
-    <version>3.6.2-SNAPSHOT</version>
+    <version>4.0.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>smallrye-jwt-build</artifactId>