Merge pull request #23844 from arjantijms/security300RC1

Integrate Jakarta Security 3.0.0-RC1
eclipse-ee4j · Mar 6, 2022 · 72ce4ae · 72ce4ae
2 parents 8429fa4 + e3330ae
commit 72ce4ae
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 5 deletions.
diff --git a/appserver/featuresets/debug/pom.xml b/appserver/featuresets/debug/pom.xml
@@ -45,6 +45,24 @@
     <name>Debug</name>
 
     <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.resolver</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.resolver</artifactId>
+            <version>2.0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.framework</artifactId>
+            <version>7.0.3</version>
+        </dependency>
+
+
+
         <dependency>
             <groupId>org.glassfish.main.featuresets</groupId>
             <artifactId>glassfish</artifactId>
@@ -70,6 +88,7 @@
             <type>pom</type>
         </dependency>
 
+
         <dependency>
             <groupId>org.glassfish.main.jdbc.jdbc-ra.jdbc-core</groupId>
             <artifactId>jdbc-core</artifactId>

diff --git a/appserver/featuresets/web/pom.xml b/appserver/featuresets/web/pom.xml
@@ -600,8 +600,7 @@
             </exclusions>
         </dependency>
 
-         <!-- Jakarta Security -->
-         <!-- TMP disable until EE 10 versions 
+        <!-- Jakarta Security -->
         <dependency>
             <groupId>jakarta.security.enterprise</groupId>
             <artifactId>jakarta.security.enterprise-api</artifactId>
@@ -632,7 +631,27 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        -->
+        <dependency>
+            <groupId>com.nimbusds</groupId>
+            <artifactId>nimbus-jose-jwt</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.io7m.jcip</groupId>
+            <artifactId>jcip-annotations</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
 
         <dependency>
             <groupId>jakarta.authentication</groupId>
@@ -1622,6 +1641,16 @@
         </dependency>
 
         <!-- json -->
+        <dependency>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
+             <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.parsson</groupId>
             <artifactId>parsson</artifactId>
@@ -1662,6 +1691,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <!-- glassfish-gui -->
         <dependency>
             <groupId>org.glassfish.jsftemplating</groupId>

diff --git a/appserver/pom.xml b/appserver/pom.xml
@@ -95,11 +95,13 @@
         <jakarta.interceptor-api.version>2.1.0</jakarta.interceptor-api.version>
 
         <!-- Jakarta Security + Authentication/Authorization -->
-        <jakarta.security-api.version>2.0.0</jakarta.security-api.version>
+        <jakarta.security-api.version>3.0.0-RC1</jakarta.security-api.version>
         <jakarta.authorization-api.version>2.1.0-RC1</jakarta.authorization-api.version>
         <jakarta.authentication-api.version>3.0.0-RC2</jakarta.authentication-api.version>
-        <soteria.version>2.0.1</soteria.version>
+        <soteria.version>3.0.0-M1</soteria.version>
         <exousia.version>2.1.0-M1</exousia.version>
+        <nimbus.version>9.20</nimbus.version>
+        <jcip.version>1.0.2</jcip.version>
 
         <!-- Jakarta Messaging -->
         <jakarta.messaging-api.version>3.1.0</jakarta.messaging-api.version>
@@ -277,6 +279,16 @@
                 <artifactId>exousia</artifactId>
                 <version>${exousia.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.nimbusds</groupId>
+                <artifactId>nimbus-jose-jwt</artifactId>
+                <version>${nimbus.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.io7m.jcip</groupId>
+                <artifactId>jcip-annotations</artifactId>
+                <version>${jcip.version}</version>
+            </dependency>
 
             <!-- Jakarta Messaging -->
             <dependency>