Merge pull request #164 from arjantijms/master

#156 Updated CDI dependency to Jakarta version
jakartaee · Feb 17, 2020 · 8337af1 · 8337af1
2 parents 9040262 + 81a3c1a
commit 8337af1
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 21 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -85,16 +85,10 @@
             <version>4.0.0-RC1</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>jakarta.ejb</groupId>
-            <artifactId>jakarta.ejb-api</artifactId>
-            <version>3.2.6</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
-            <version>2.0.2</version>
+            <version>3.0.0-M1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/api/src/main/java/jakarta/security/enterprise/SecurityContext.java b/api/src/main/java/jakarta/security/enterprise/SecurityContext.java
@@ -19,7 +19,6 @@
 import java.security.Principal;
 import java.util.Set;
 
-import javax.ejb.SessionContext;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
@@ -78,7 +77,7 @@ public interface SecurityContext {
 	 * Should code in either such Jakarta Servlet or Jakarta Enterprise Bean wish to take such mapped (aka referenced, linked) 
 	 * roles into account, the facilities for that specific container should be used instead. For instance for Servlet that 
 	 * would be {@link HttpServletRequest#isUserInRole(String)} and for Jakarta Enterprise Beans that would be
-	 * {@link SessionContext#isCallerInRole(String)}.
+	 * {@link jakarta.ejb.SessionContext#isCallerInRole(String)}.
 	 *
 	 *
 	 * @param role a <code>String</code> specifying the name of the logical application role

diff --git a/...enterprise/authentication/mechanism/http/CustomFormAuthenticationMechanismDefinition.java b/...enterprise/authentication/mechanism/http/CustomFormAuthenticationMechanismDefinition.java
@@ -22,24 +22,24 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.util.Nonbinding;
 
 import jakarta.security.enterprise.SecurityContext;
 
 /**
  * Annotation used to define a container authentication mechanism that implements
  * authentication resembling Servlet FORM authentication (Servlet spec 13.6.3).
- * <p> 
- * Instead of posting back to a predefined action to continue the authentication dialog 
- * (Servlet spec 13.6.3 step 3), this variant depends on the application calling 
+ * <p>
+ * Instead of posting back to a predefined action to continue the authentication dialog
+ * (Servlet spec 13.6.3 step 3), this variant depends on the application calling
  * {@link SecurityContext#authenticate(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse, jakarta.security.enterprise.authentication.mechanism.http.AuthenticationParameters)}
- * 
+ *
  */
 @Retention(RUNTIME)
 @Target(TYPE)
 public @interface CustomFormAuthenticationMechanismDefinition {
- 
+
     @Nonbinding
     LoginToContinue loginToContinue();
-    
+
 }
diff --git a/...urity/enterprise/authentication/mechanism/http/FormAuthenticationMechanismDefinition.java b/...urity/enterprise/authentication/mechanism/http/FormAuthenticationMechanismDefinition.java
@@ -22,7 +22,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.util.Nonbinding;
 
 /**
  * Annotation used to define a container authentication mechanism that implements
@@ -33,8 +33,8 @@
 @Retention(RUNTIME)
 @Target(TYPE)
 public @interface FormAuthenticationMechanismDefinition {
- 
+
     @Nonbinding
     LoginToContinue loginToContinue();
-    
+
 }
diff --git a/.../main/java/jakarta/security/enterprise/authentication/mechanism/http/LoginToContinue.java b/.../main/java/jakarta/security/enterprise/authentication/mechanism/http/LoginToContinue.java
@@ -24,7 +24,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.util.Nonbinding;
 
 import jakarta.interceptor.InterceptorBinding;
 

diff --git a/api/src/main/java/jakarta/security/enterprise/authentication/mechanism/http/RememberMe.java b/api/src/main/java/jakarta/security/enterprise/authentication/mechanism/http/RememberMe.java
@@ -24,7 +24,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.util.Nonbinding;
 
 import jakarta.el.ELProcessor;
 import jakarta.interceptor.InterceptorBinding;