Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#156 Updated CDI dependency to Jakarta version #164

Merged
merged 2 commits into from
Feb 17, 2020
Merged

#156 Updated CDI dependency to Jakarta version #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19fa5bb
#156 Updated CDI dependency to Jakarta version
arjantijms Feb 17, 2020
81a3c1a
#156 Using jakarta.* for EJB javadoc reference
arjantijms Feb 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions api/src/main/java/jakarta/security/enterprise/SecurityContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions ...enterprise/authentication/mechanism/http/CustomFormAuthenticationMechanismDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

}
6 changes: 3 additions & 3 deletions ...urity/enterprise/authentication/mechanism/http/FormAuthenticationMechanismDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -33,8 +33,8 @@
@Retention(RUNTIME)
@Target(TYPE)
public @interface FormAuthenticationMechanismDefinition {

@Nonbinding
LoginToContinue loginToContinue();

}
2 changes: 1 addition & 1 deletion .../main/java/jakarta/security/enterprise/authentication/mechanism/http/LoginToContinue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/jakarta/security/enterprise/authentication/mechanism/http/RememberMe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down