Skip to content

Commit 5fe1b62

Browse files
authored
Merge pull request microprofile#324 from sberyozkin/remove_optional_spec_text
Remove optional spec text and TCK tests
2 parents 17cf110 + 38b685a commit 5fe1b62

File tree

15 files changed

+18
-790
lines changed

15 files changed

+18
-790
lines changed

api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>org.eclipse.microprofile.jwt</groupId>
2121
<artifactId>microprofile-jwt-auth-parent</artifactId>
22-
<version>2.2-SNAPSHOT</version>
22+
<version>3.0-SNAPSHOT</version>
2323
</parent>
2424

2525
<artifactId>microprofile-jwt-auth-api</artifactId>

pom.xml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,14 @@
2424

2525
<groupId>org.eclipse.microprofile.jwt</groupId>
2626
<artifactId>microprofile-jwt-auth-parent</artifactId>
27-
<version>2.2-SNAPSHOT</version>
27+
<version>3.0-SNAPSHOT</version>
2828

2929
<packaging>pom</packaging>
3030
<name>MicroProfile JWT Auth</name>
3131
<url>https://github.com/eclipse/microprofile-jwt-auth</url>
3232

3333
<properties>
34-
<version.jakarta.authorization-api>2.0.0</version.jakarta.authorization-api>
35-
<version.jakarta.ejb.api>4.0.0</version.jakarta.ejb.api>
36-
<version.microprofile.config>3.0</version.microprofile.config>
34+
<version.microprofile.config>3.1</version.microprofile.config>
3735
<version.jose4j>0.9.4</version.jose4j>
3836
<version.osgi.versioning>1.1.0</version.osgi.versioning>
3937
<version.microprofile.tck.bom>2.6</version.microprofile.tck.bom>
@@ -125,20 +123,6 @@
125123

126124
<dependencyManagement>
127125
<dependencies>
128-
<dependency>
129-
<groupId>jakarta.authorization</groupId>
130-
<artifactId>jakarta.authorization-api</artifactId>
131-
<version>${version.jakarta.authorization-api}</version>
132-
<scope>provided</scope>
133-
<optional>true</optional>
134-
</dependency>
135-
<dependency>
136-
<groupId>jakarta.ejb</groupId>
137-
<artifactId>jakarta.ejb-api</artifactId>
138-
<version>${version.jakarta.ejb.api}</version>
139-
<scope>provided</scope>
140-
<optional>true</optional>
141-
</dependency>
142126
<dependency>
143127
<groupId>org.osgi</groupId>
144128
<artifactId>org.osgi.annotation.versioning</artifactId>

spec/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>org.eclipse.microprofile.jwt</groupId>
2121
<artifactId>microprofile-jwt-auth-parent</artifactId>
22-
<version>2.2-SNAPSHOT</version>
22+
<version>3.0-SNAPSHOT</version>
2323
</parent>
2424

2525
<artifactId>microprofile-jwt-auth-spec</artifactId>

spec/src/main/asciidoc/interoperability.asciidoc

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -673,43 +673,6 @@ The expectations for use of the various security annotations described in sectio
673673

674674
In terms of mapping between the MP-JWT claims and role names used in @RolesAllowed, the role names that have been mapped to group names in the MP-JWT "groups" claim, MUST result in an allowing authorization decision wherever the security constraint has been applied.
675675

676-
### Recommendations for Optional Container Integration
677-
This section describes the expected behaviors for Jakarta EE container APIs other than JAX-RS.
678-
679-
#### jakarta.security.enterprise.identitystore.IdentityStore.getCallerGroups(CredentialValidationResult)
680-
This method should return the set of names found in the "groups" claim in the JWT if it exists, an empty set otherwise.
681-
682-
#### jakarta.ejb.SessionContext.getCallerPrincipal()
683-
The java.security.Principal returned from this method MUST be an instance of `org.eclipse.microprofile.jwt.JsonWebToken`.
684-
685-
#### jakarta.ejb.SessionContext#isCallerInRole(String)
686-
This method MUST return true for any name that is included in the MP-JWT "groups" claim, as well as for any
687-
role name that has been mapped to a group name in the MP-JWT "groups" claim.
688-
689-
#### Overriding @LoginConfig from web.xml login-config
690-
If a deployment with a web.xml descriptor contains a login-config element, an MP-JWT implementation should view the
691-
web.xml metadata as an override to the deployment annotation.
692-
693-
#### jakarta.servlet.http.HttpServletRequest.getUserPrincipal()
694-
The java.security.Principal returned from this method MUST be an instance of org.eclipse.microprofile.jwt.JsonWebToken.
695-
696-
#### jakarta.servlet.http.HttpServletRequest#isUserInRole(String)
697-
This method MUST return true for any name that is included in the MP-JWT "groups" claim, as well as for any
698-
role name that has been mapped to a group name in the MP-JWT "groups" claim.
699-
700-
#### jakarta.security.jacc.PolicyContext.getContext("javax.security.auth.Subject.container")
701-
The javax.security.auth.Subject returned by the PolicyContext.getContext(String key) method with the standard
702-
"javax.security.auth.Subject.container" key, MUST return a Subject that has a `java.security.Principal` of type
703-
`org.eclipse.microprofile.jwt.JsonWebToken` amongst it's set of `Principal`s returned by `getPrincipals()``. Similarly,
704-
`Subject#getPrincipals(JsonWebToken.class)` must return a set with at least one value. This means that following code
705-
snipet must not throw an AssertionError:
706-
707-
```java
708-
Subject subject = (Subject) PolicyContext.getContext("javax.security.auth.Subject.container");
709-
Set<? extends Principal> principalSet = subject.getPrincipals(JsonWebToken.class);
710-
assert principalSet.size() > 0;
711-
```
712-
713676
## Mapping MP-JWT Token to Other Container APIs
714677
For non-Jakarta EE containers that provide access to some form of `java.security.Principal` representation of an authenticated
715678
caller, the caller principal MUST be compatible with the `org.eclipse.microprofile.jwt.JsonWebToken` interface.

tck/pom.xml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>org.eclipse.microprofile.jwt</groupId>
2121
<artifactId>microprofile-jwt-auth-parent</artifactId>
22-
<version>2.2-SNAPSHOT</version>
22+
<version>3.0-SNAPSHOT</version>
2323
</parent>
2424

2525
<artifactId>microprofile-jwt-auth-tck</artifactId>
@@ -59,14 +59,6 @@
5959
<groupId>jakarta.ws.rs</groupId>
6060
<artifactId>jakarta.ws.rs-api</artifactId>
6161
</dependency>
62-
<dependency>
63-
<groupId>jakarta.authorization</groupId>
64-
<artifactId>jakarta.authorization-api</artifactId>
65-
</dependency>
66-
<dependency>
67-
<groupId>jakarta.ejb</groupId>
68-
<artifactId>jakarta.ejb-api</artifactId>
69-
</dependency>
7062
<dependency>
7163
<groupId>org.bitbucket.b_c</groupId>
7264
<artifactId>jose4j</artifactId>

tck/src/test/java/org/eclipse/microprofile/jwt/tck/container/ejb/EjbEndpoint.java

Lines changed: 0 additions & 60 deletions
This file was deleted.

tck/src/test/java/org/eclipse/microprofile/jwt/tck/container/ejb/EjbTest.java

Lines changed: 0 additions & 138 deletions
This file was deleted.

tck/src/test/java/org/eclipse/microprofile/jwt/tck/container/ejb/IService.java

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)