Integrate latest Jakarta EE 11 versions and update for Soteria 4

Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
eclipse-ee4j · May 11, 2024 · 1041622 · 1041622
1 parent 4f3f302
commit 1041622
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 19 deletions.
diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml
@@ -1167,7 +1167,7 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish.soteria</groupId>
-            <artifactId>jakarta.security.enterprise</artifactId>
+            <artifactId>soteria</artifactId>
             <optional>true</optional>
         </dependency>
 

diff --git a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
@@ -1119,7 +1119,7 @@
         <!-- Jakarta Security -->
         <dependency>
             <groupId>org.glassfish.soteria</groupId>
-            <artifactId>jakarta.security.enterprise</artifactId>
+            <artifactId>soteria</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>

diff --git a/appserver/extras/embedded/web/pom.xml b/appserver/extras/embedded/web/pom.xml
@@ -1061,30 +1061,31 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.soteria</groupId>
-            <artifactId>jakarta.security.enterprise</artifactId>
+            <groupId>jakarta.security.enterprise</groupId>
+            <artifactId>jakarta.security.enterprise-api</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.exousia</groupId>
-            <artifactId>exousia</artifactId>
+            <groupId>org.glassfish.soteria</groupId>
+            <artifactId>soteria</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>com.nimbusds</groupId>
-            <artifactId>nimbus-jose-jwt</artifactId>
+            <groupId>org.glassfish.exousia</groupId>
+            <artifactId>exousia</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
+         <dependency>
             <groupId>org.glassfish.epicyro</groupId>
             <artifactId>epicyro</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>jakarta.security.enterprise</groupId>
-            <artifactId>jakarta.security.enterprise-api</artifactId>
+            <groupId>com.nimbusds</groupId>
+            <artifactId>nimbus-jose-jwt</artifactId>
             <optional>true</optional>
         </dependency>
+
 
         <!-- glassfish-cdi -->
         <dependency>

diff --git a/appserver/featuresets/web/pom.xml b/appserver/featuresets/web/pom.xml
@@ -611,7 +611,7 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish.soteria</groupId>
-            <artifactId>jakarta.security.enterprise</artifactId>
+            <artifactId>soteria</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>

diff --git a/appserver/pom.xml b/appserver/pom.xml
@@ -81,8 +81,8 @@
         <!-- Jakarta API Versions -->
 
         <!-- Jakarta Faces -->
-        <jakarta.faces-api.version>4.1.0-M2</jakarta.faces-api.version>
-        <mojarra.version>4.1.0-M2</mojarra.version>
+        <jakarta.faces-api.version>4.1.0</jakarta.faces-api.version>
+        <mojarra.version>4.1.0</mojarra.version>
 
         <!-- Jakarta WebSocket -->
         <jakarta.websocket-api.version>2.2.0</jakarta.websocket-api.version>
@@ -97,15 +97,15 @@
 
         <!-- Jakarta Security + Authentication/Authorization -->
         <!-- APIs -->
-        <jakarta.security-api.version>4.0.0-M2</jakarta.security-api.version>
+        <jakarta.security-api.version>4.0.0</jakarta.security-api.version>
         <jakarta.authorization-api.version>3.0.0</jakarta.authorization-api.version>
         <jakarta.authentication-api.version>3.1.0</jakarta.authentication-api.version>
         <!-- Implementations -->
-        <soteria.version>4.0.0-M3</soteria.version>
+        <soteria.version>4.0.0</soteria.version>
         <exousia.version>3.0.0-M3</exousia.version>
         <epicyro.version>3.1.0</epicyro.version>
         <!-- Dependencies -->
-        <nimbus.version>9.38-rc4</nimbus.version>
+        <nimbus.version>9.38</nimbus.version>
         <jcip.version>1.0.2</jcip.version>
 
         <!-- Jakarta Messaging -->
@@ -280,7 +280,7 @@
             </dependency>
             <dependency>
                 <groupId>org.glassfish.soteria</groupId>
-                <artifactId>jakarta.security.enterprise</artifactId>
+                <artifactId>soteria</artifactId>
                 <version>${soteria.version}</version>
             </dependency>
             <dependency>

diff --git a/appserver/web/web-glue/pom.xml b/appserver/web/web-glue/pom.xml
@@ -68,7 +68,7 @@
     <dependencies>
         <dependency>
             <groupId>org.glassfish.soteria</groupId>
-            <artifactId>jakarta.security.enterprise</artifactId>
+            <artifactId>soteria</artifactId>
         </dependency>
 
         <dependency>