Added Mojarra 4.1 M1 (as snapshot) support.

Faces TCK runs to some degree. It (obviously) fails on the Jakarta Validation support, which has not yet been updated. Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
eclipse-ee4j · Dec 11, 2023 · 30554fe · 30554fe
1 parent 2d51213
commit 30554fe
Show file tree

Hide file tree

Showing 6 changed files with 176 additions and 8 deletions.
diff --git a/appserver/distributions/glassfish/pom.xml b/appserver/distributions/glassfish/pom.xml
@@ -126,13 +126,19 @@
                                     destfile="${glassfish.modules}/hibernate-validator.jar"
                                 />
 
-                                <!-- tmp, we have newer faces, but to stop cascade of updates -->
                                 <jarupdate
-                                    basedir="${patches}/jakarta.faces" includes="META-INF/MANIFEST.MF"
-                                    destfile="${glassfish.modules}/jakarta.faces.jar"
+                                    basedir="${patches}/hibernate-validator" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/hibernate-validator.jar"
+                                />
+
+                                <jarupdate
+                                    basedir="${patches}/jakarta.enterprise.cdi-el-api" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/jakarta.enterprise.cdi-el-api.jar"
                                 />
 
 
+
+
                                 <!-- To support JSP 5 -->
                                 <jarupdate
                                     basedir="${patches}/jersey-mvc-jsp" includes="META-INF/MANIFEST.MF"
@@ -157,6 +163,14 @@
                                     basedir="${patches}/jersey-hk2" includes="META-INF/MANIFEST.MF"
                                     destfile="${glassfish.modules}/jersey-hk2.jar"
                                 />
+                                <jarupdate
+                                    basedir="${patches}/jersey-media-json-jackson" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/jersey-media-json-jackson.jar"
+                                />
+                                <jarupdate
+                                    basedir="${patches}/jersey-entity-filtering" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/jersey-entity-filtering.jar"
+                                />
                                 <jarupdate
                                     basedir="${patches}/jersey-media-sse" includes="META-INF/MANIFEST.MF"
                                     destfile="${glassfish.modules}/jersey-media-sse.jar"

diff --git a/...stributions/glassfish/src/main/patches/jakarta.enterprise.cdi-el-api/META-INF/MANIFEST.MF b/...stributions/glassfish/src/main/patches/jakarta.enterprise.cdi-el-api/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Created-By: Apache Maven Bundle Plugin 5.1.9
+Build-Jdk-Spec: 11
+Bundle-Description: API for integrating CDI with Unified EL
+Bundle-DocURL: https://www.eclipse.org
+Bundle-License: https://repository.jboss.org/licenses/apache-2.0.txt
+Bundle-ManifestVersion: 2
+Bundle-Name: CDI EL integration API
+Bundle-SymbolicName: jakarta.enterprise.cdi-el-api
+Bundle-Vendor: Eclipse Foundation
+Bundle-Version: 4.1.0.M1
+Export-Package: jakarta.enterprise.inject.spi.el;version="4.1";uses:="ja
+ karta.el"
+Import-Package: jakarta.el;version="6.0",jakarta.enterprise.context,jaka
+ rta.enterprise.inject.spi
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=11))"
+Tool: Bnd-6.3.1.202206071316
+
diff --git a/...ver/distributions/glassfish/src/main/patches/jersey-entity-filtering/META-INF/MANIFEST.MF b/...ver/distributions/glassfish/src/main/patches/jersey-entity-filtering/META-INF/MANIFEST.MF
@@ -0,0 +1,45 @@
+Manifest-Version: 1.0
+Build-Jdk-Spec: 11
+Bundle-Description: Jersey extension module providing support for Enti
+ ty Data Filtering.
+Bundle-DocURL: https://www.eclipse.org/org/foundation/
+Bundle-License: http://www.eclipse.org/legal/epl-2.0, https://www.gnu.
+ org/software/classpath/license.html, http://www.eclipse.org/org/docum
+ ents/edl-v10.php, https://opensource.org/licenses/BSD-2-Clause, http:
+ //www.apache.org/licenses/LICENSE-2.0.html, https://creativecommons.o
+ rg/publicdomain/zero/1.0/, https://asm.ow2.io/license.html, jquery.or
+ g/license, http://www.opensource.org/licenses/mit-license.php, https:
+ //www.w3.org/Consortium/Legal/copyright-documents-19990405
+Bundle-ManifestVersion: 2
+Bundle-Name: jersey-ext-entity-filtering
+Bundle-SymbolicName: org.glassfish.jersey.ext.jersey-entity-filtering
+Bundle-Vendor: Eclipse Foundation
+Bundle-Version: 3.1.4
+Created-By: Apache Maven Bundle Plugin 5.1.9
+Export-Package: org.glassfish.jersey.message.filtering;version="3.1.4"
+ ;uses:="jakarta.annotation,jakarta.annotation.security,jakarta.inject
+ ,jakarta.ws.rs.core,org.glassfish.jersey.message.filtering.spi",org.g
+ lassfish.jersey.message.filtering.internal;version="3.1.4";uses:="org
+ .glassfish.jersey.internal.l10n",org.glassfish.jersey.message.filteri
+ ng.spi;version="3.1.4";uses:="jakarta.ws.rs.core,org.glassfish.jersey
+ .spi"
+Import-Package: jakarta.annotation;version="[2.0,4)",jakarta.annotatio
+ n.security;version="[2.0,4)",jakarta.inject;version="[2.0,3)",jakarta
+ .ws.rs;version="[3.1,4)",jakarta.ws.rs.core;version="[3.1,4)",jakarta
+ .xml.bind;version="[4.0,5)",java.lang,java.lang.annotation,java.lang.
+ reflect,java.security,java.util,java.util.concurrent,java.util.functi
+ on,java.util.logging,java.util.regex,java.util.stream,org.glassfish.j
+ ersey.internal.guava;version="[3.1,4)",org.glassfish.jersey.internal.
+ inject;version="[3.1,4)",org.glassfish.jersey.internal.l10n;version="
+ [3.1,4)",org.glassfish.jersey.internal.util;version="[3.1,4)",org.gla
+ ssfish.jersey.internal.util.collection;version="[3.1,4)",org.glassfis
+ h.jersey.message.filtering;version="[3.1,4)",org.glassfish.jersey.mes
+ sage.filtering.internal;version="[3.1,4)",org.glassfish.jersey.messag
+ e.filtering.spi;version="[3.1,4)",org.glassfish.jersey.model.internal
+ ;version="[3.1,4)",org.glassfish.jersey.server;version="[3.1,4)",org.
+ glassfish.jersey.server.filter;version="[3.1,4)",org.glassfish.jersey
+ .server.model;version="[3.1,4)",org.glassfish.jersey.spi;version="[3.
+ 1,4)"
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=11))"
+Tool: Bnd-6.3.1.202206071316
+
diff --git a/...r/distributions/glassfish/src/main/patches/jersey-media-json-jackson/META-INF/MANIFEST.MF b/...r/distributions/glassfish/src/main/patches/jersey-media-json-jackson/META-INF/MANIFEST.MF
@@ -0,0 +1,75 @@
+Manifest-Version: 1.0
+Build-Jdk-Spec: 11
+Bundle-Description: Jersey JSON Jackson (2.x) entity providers support
+  module.
+Bundle-DocURL: https://www.eclipse.org/org/foundation/
+Bundle-License: http://www.eclipse.org/legal/epl-2.0, https://www.gnu.
+ org/software/classpath/license.html, http://www.apache.org/licenses/L
+ ICENSE-2.0.html
+Bundle-ManifestVersion: 2
+Bundle-Name: jersey-media-json-jackson
+Bundle-SymbolicName: org.glassfish.jersey.media.jersey-media-json-jack
+ son
+Bundle-Vendor: Eclipse Foundation
+Bundle-Version: 3.1.4
+Created-By: Apache Maven Bundle Plugin 5.1.9
+Export-Package: org.glassfish.jersey.jackson;uses:="jakarta.ws.rs.core
+ ,org.glassfish.jersey.internal.l10n";version="3.1.4",org.glassfish.je
+ rsey.jackson.internal;uses:="com.fasterxml.jackson.databind,com.faste
+ rxml.jackson.databind.ser,jakarta.annotation,jakarta.inject,jakarta.w
+ s.rs.core,jakarta.ws.rs.ext,org.glassfish.jersey.internal.spi,org.gla
+ ssfish.jersey.jackson.internal.jackson.jaxrs.cfg,org.glassfish.jersey
+ .jackson.internal.jackson.jaxrs.json,org.glassfish.jersey.message.fil
+ tering.spi";version="3.1.4",org.glassfish.jersey.jackson.internal.jac
+ kson.jaxrs.annotation;uses:="com.fasterxml.jackson.annotation,com.fas
+ terxml.jackson.databind";version="3.1.4",org.glassfish.jersey.jackson
+ .internal.jackson.jaxrs.base;uses:="com.fasterxml.jackson.core,com.fa
+ sterxml.jackson.databind,jakarta.ws.rs.core,jakarta.ws.rs.ext,org.gla
+ ssfish.jersey.jackson.internal.jackson.jaxrs.cfg,org.glassfish.jersey
+ .jackson.internal.jackson.jaxrs.util";version="3.1.4",org.glassfish.j
+ ersey.jackson.internal.jackson.jaxrs.cfg;uses:="com.fasterxml.jackson
+ .core,com.fasterxml.jackson.databind,com.fasterxml.jackson.databind.c
+ fg,jakarta.ws.rs.core";version="3.1.4",org.glassfish.jersey.jackson.i
+ nternal.jackson.jaxrs.json;uses:="com.fasterxml.jackson.core,com.fast
+ erxml.jackson.databind,com.fasterxml.jackson.databind.cfg,jakarta.ws.
+ rs,jakarta.ws.rs.core,jakarta.ws.rs.ext,org.glassfish.jersey.jackson.
+ internal.jackson.jaxrs.base,org.glassfish.jersey.jackson.internal.jac
+ kson.jaxrs.cfg,org.glassfish.jersey.jackson.internal.jackson.jaxrs.js
+ on.annotation";version="3.1.4",org.glassfish.jersey.jackson.internal.
+ jackson.jaxrs.json.annotation;uses:="com.fasterxml.jackson.annotation
+ ";version="3.1.4",org.glassfish.jersey.jackson.internal.jackson.jaxrs
+ .util;uses:="com.fasterxml.jackson.databind,com.fasterxml.jackson.dat
+ abind.introspect";version="3.1.4"
+Import-Package: jakarta.annotation;version="[2.0,4)",com.fasterxml.jac
+ kson.annotation;version="[2.15,3)",com.fasterxml.jackson.core;version
+ ="[2.15,3)",com.fasterxml.jackson.core.util;version="[2.15,3)",com.fa
+ sterxml.jackson.databind;version="[2.15,3)",com.fasterxml.jackson.dat
+ abind.cfg;version="[2.15,3)",com.fasterxml.jackson.databind.introspec
+ t;version="[2.15,3)",com.fasterxml.jackson.databind.jsonFormatVisitor
+ s;version="[2.15,3)",com.fasterxml.jackson.databind.node;version="[2.
+ 15,3)",com.fasterxml.jackson.databind.ser;version="[2.15,3)",com.fast
+ erxml.jackson.databind.ser.impl;version="[2.15,3)",com.fasterxml.jack
+ son.databind.type;version="[2.15,3)",com.fasterxml.jackson.databind.u
+ til;version="[2.15,3)",com.fasterxml.jackson.module.jakarta.xmlbind;v
+ ersion="[2.15,3)",com.fasterxml.jackson.module.jaxb;version="[2.15,3)
+ ";resolution:=optional,jakarta.inject;version="[2.0,3)",jakarta.ws.rs
+ ;version="[3.1,4)",jakarta.ws.rs.core;version="[3.1,4)",jakarta.ws.rs
+ .ext;version="[3.1,4)",java.io,java.lang,java.lang.annotation,java.la
+ ng.invoke,java.lang.reflect,java.security,java.util,java.util.concurr
+ ent.atomic,java.util.function,java.util.logging,org.glassfish.jersey;
+ version="[3.1,4)",org.glassfish.jersey.internal.inject;version="[3.1,
+ 4)",org.glassfish.jersey.internal.l10n;version="[3.1,4)",org.glassfis
+ h.jersey.internal.spi;version="[3.1,4)",org.glassfish.jersey.internal
+ .util;version="[3.1,4)",org.glassfish.jersey.internal.util.collection
+ ;version="[3.1,4)",org.glassfish.jersey.jackson,org.glassfish.jersey.
+ jackson.internal,org.glassfish.jersey.jackson.internal.jackson.jaxrs.
+ annotation,org.glassfish.jersey.jackson.internal.jackson.jaxrs.base,o
+ rg.glassfish.jersey.jackson.internal.jackson.jaxrs.cfg,org.glassfish.
+ jersey.jackson.internal.jackson.jaxrs.json,org.glassfish.jersey.jacks
+ on.internal.jackson.jaxrs.json.annotation,org.glassfish.jersey.jackso
+ n.internal.jackson.jaxrs.util,org.glassfish.jersey.message;version="[
+ 3.1,4)",org.glassfish.jersey.message.filtering;version="[3.1,4)",org.
+ glassfish.jersey.message.filtering.spi;version="[3.1,4)"
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=11))"
+Tool: Bnd-6.3.1.202206071316
+
diff --git a/appserver/featuresets/web/pom.xml b/appserver/featuresets/web/pom.xml
@@ -1672,6 +1672,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-el-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.glassfish.main.web</groupId>
             <artifactId>cdi-api-fragment</artifactId>

diff --git a/appserver/pom.xml b/appserver/pom.xml
@@ -81,11 +81,11 @@
         <!-- Jakarta API Versions -->
 
         <!-- Jakarta Faces -->
-        <jakarta.faces-api.version>4.0.1</jakarta.faces-api.version>
-        <mojarra.version>4.0.5</mojarra.version>
+        <jakarta.faces-api.version>4.1.0-SNAPSHOT</jakarta.faces-api.version>
+        <mojarra.version>4.1.0-SNAPSHOT</mojarra.version>
 
         <!-- Jakarta WebSocket -->
-        <jakarta.websocket-api.version>2.1.1</jakarta.websocket-api.version>
+        <jakarta.websocket-api.version>2.2.0-M1</jakarta.websocket-api.version>
         <tyrus.version>2.1.4</tyrus.version>
 
         <!-- Jakarta Concurrency -->
@@ -96,7 +96,7 @@
         <jakarta.interceptor-api.version>2.2.0-M1</jakarta.interceptor-api.version>
 
         <!-- Jakarta Security + Authentication/Authorization -->
-        <soteria.version>4.0.0-SNAPSHOT</soteria.version>
+        <soteria.version>4.0.0-M1</soteria.version>
         <exousia.version>3.0.0-M1</exousia.version>
         <epicyro.version>3.1.0-M1</epicyro.version>
         <nimbus.version>9.37</nimbus.version>
@@ -163,7 +163,7 @@
         <reactive-streams.version>1.0.4</reactive-streams.version>
 
         <!-- Admin console components -->
-        <jsftemplating.version>4.0.3</jsftemplating.version>
+        <jsftemplating.version>4.1.0-SNAPSHOT</jsftemplating.version>
         <jsf-ext.version>0.2</jsf-ext.version>
         <woodstock.version>6.0.1</woodstock.version>
         <woodstock-dataprovider.version>1.0</woodstock-dataprovider.version>
@@ -511,6 +511,12 @@
                 <artifactId>jakarta.enterprise.lang-model</artifactId>
                 <version>${jakarta.cdi-api.version}</version>
             </dependency>
+            <dependency>
+                <groupId>jakarta.enterprise</groupId>
+                <artifactId>jakarta.enterprise.cdi-el-api</artifactId>
+                <version>${jakarta.cdi-api.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.jboss.weld</groupId>
                 <artifactId>weld-osgi-bundle</artifactId>