Merge branch 'master' into 4.1

Author: BalusC

.github/workflows/build.yml

@@ -17,10 +17,25 @@ jobs:
         os: [ubuntu-latest]
     steps:
     - name: Checkout Sources
-      uses: actions/checkout@v1
+      uses: actions/checkout@v4
+      with:
+        submodules: 'true'
+    - name: Checkout API
+      uses: actions/checkout@v4
+      with:
+          repository: jakartaee/faces
+          ref: '5.0'
+          path: './faces'
     - name: Setup Java
       uses: actions/setup-java@v1
       with:
         java-version: ${{ matrix.java }}
+    - name: Setup Maven Action
+      uses: s4u/[email protected]
+      with:
+          checkout-fetch-depth: 0
+          java-version: 17
+          java-distribution: temurin
+          maven-version: 3.9.6
     - name: Build with Maven
-      run: mvn --no-transfer-progress install -Pstaging
+      run: mvn --no-transfer-progress install -Pstaging -Papi

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "faces"]
+	path = faces
+	url = https://github.com/jakartaee/faces.git
+	branch = 5.0

README.md

@@ -14,30 +14,33 @@
 [//]: # " SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 "
 -->
 
-# Mojarra 4.1
+# Mojarra 5.0
 
-Eclipse's implementation of the Jakarta Faces 4.1 specification.
+Eclipse's implementation of the Jakarta Faces 5.0 specification
 
-For Mojarra / JSF 2.3 please have a look at https://github.com/eclipse-ee4j/mojarra/blob/2.3/README.md.  
-For Mojarra / JSF 3.0 please have a look at https://github.com/eclipse-ee4j/mojarra/blob/3.0/README.md.
-For Mojarra / JSF 4.0 please have a look at https://github.com/eclipse-ee4j/mojarra/blob/4.0/README.md.
+* Mojarra 5.0 - this branch, under development
+* [Mojarra 4.1](https://github.com/eclipse-ee4j/mojarra/blob/4.1/README.md) - stable release
+* [Mojarra 4.0](https://github.com/eclipse-ee4j/mojarra/blob/4.0/README.md) - stable release
+* [Mojarra 3.0](https://github.com/eclipse-ee4j/mojarra/blob/3.0/README.md) - legacy release
+* [Mojarra 2.3](https://github.com/eclipse-ee4j/mojarra/blob/2.3/README.md) - legacy release
+
+For support on Mojarra 2.3 and earlier please contact your vendor for support (RedHat, IBM,
+Oracle, Omnifish, Payara, etceteras)
 
 ## Minimum Requirements
 
 - Java 17
 - Jakarta Servlet 6.1
 - Jakarta Expression Language 6.0
-- jakarta CDI 4.1
+- Jakarta CDI 4.1
 - Jakarta Web Socket 2.2 (optional, only when `<f:websocket>` is used)
 - Jakarta JSON Processing  2.1 (optional, only when `<f:websocket>` is used)
 - Jakarta Validation 3.1 (optional, only when `<f:validateBean>` or `<f:validateWholeBean>` is used)
 
-CDI is explicitly required because since Jakarta Faces 2.3 the `javax.faces.bean.*` annotations such as `@ManagedBean` are deprecated, and since 4.0 these have been removed. Several implicit Jakarta Expression Language objects are produced via CDI producers, and `<f:websocket>` manages the Jakarta WebSocket sessions and events via CDI.
-
 
 ## Installation
 
-Depending on the server used, Jakarta Faces may already be built-in (full fledged Jakarta EE containers such as [WildFly][1], [JBoss EAP][2], [TomEE][3], [Payara][4], [GlassFish][5], [Liberty][6], etc.), or not (barebones Jakarta Server Pages/Jakarta Servlet containers such as [Tomcat][7], [Jetty][8], etc.). If the server doesn't ship with Jakarta Faces built-in, then you need to manually install Jakarta Faces 4.1 along with a CDI 4.1+, Jakarta JSON Processing 2.1+ as those Jakarta Servlet containers usually also don't ship with those Jakarta Faces dependencies.
+Depending on the server used, Jakarta Faces may already be built-in (full fledged Jakarta EE containers such as [WildFly][1], [JBoss EAP][2], [TomEE][3], [Payara][4], [GlassFish][5], [Liberty][6], etc.), or not (barebones Jakarta Server Pages/Jakarta Servlet containers such as [Tomcat][7], [Jetty][8], etc.). If the server doesn't ship with Jakarta Faces built-in, then you need to manually install Jakarta Faces 4.0 along with CDI 4.0+, Jakarta JSON Processing 2.0+ and Jakarta Standard Tag Library 2.0+ as those Jakarta Servlet containers usually also don't even ship with those Jakarta Faces dependencies.
 
 
 ### Non-Maven

RELEASE.md

@@ -1,35 +1,39 @@
 # Releasing a new Mojarra version
 
-In below example we assume 3.0.3.
+In below example we assume 4.0.3.
 
 1. Check beforehand that this version does NOT exist in [staging](https://jakarta.oss.sonatype.org/content/repositories/staging/org/glassfish/jakarta.faces/) else bump the version
 2. Go to [Mojarra CI](https://ci.eclipse.org/mojarra/)
 3. [Log in](https://ci.eclipse.org/mojarra/login?from=%2Fmojarra%2F)
 4. Open [1_mojarra_build_and_stage](https://ci.eclipse.org/mojarra/job/1_mojarra-build-and-stage/)
 5. Click [Build with parameters](https://ci.eclipse.org/mojarra/job/1_mojarra-build-and-stage/build) in menu 
-    - `BRANCH` = `3.0`
-    - `RELEASE_VERSION` = `3.0.3`
-    - `JDK` = `JDK8`
+    - `BRANCH` = `4.0`
+    - `RELEASE_VERSION` = `4.0.3`
+    - `JDK` = `JDK11`
     - click [Build] button
 6. Wait for it to finish successfully
-7. Drill down into this build e.g. [build 95](https://ci.eclipse.org/mojarra/job/1_mojarra-build-and-stage/95)
-8. Click [Console Output](https://ci.eclipse.org/mojarra/job/1_mojarra-build-and-stage/95/console) in menu
-9. Ctrl+F 'orgglassfish', to find release ID, e.g. `Created staging repository with ID "orgglassfish-1230"`, remember this for `STAGING_RELEASE_ID` in a later step
+7. Drill down into this build e.g. [build 106](https://ci.eclipse.org/mojarra/job/1_mojarra-build-and-stage/106)
+8. Click [Console Output](https://ci.eclipse.org/mojarra/job/1_mojarra-build-and-stage/106/console) in menu
+9. Ctrl+F 'orgglassfish', to find release ID, e.g. `Created staging repository with ID "orgglassfish-1273"`, remember this for `STAGING_RELEASE_ID` in a later step
 10. Verify that it's present in [staging](https://jakarta.oss.sonatype.org/content/repositories/staging/org/glassfish/jakarta.faces/)
-11. Verify that a new [3.0.3](https://github.com/eclipse-ee4j/mojarra/tree/3.0.3) branch is created 
-12. Verify that a new [3.0.3-RELEASE](https://github.com/eclipse-ee4j/mojarra/releases/tag/3.0.3-RELEASE) tag is created 
-13. Open [2_mojarra-run-tck-against-staged-build_3_0](https://ci.eclipse.org/mojarra/job/2_mojarra-run-tck-against-staged-build_3_0) (there are separate ones for 2.3 and 4.0)
-14. Click [Build with parameters](https://ci.eclipse.org/mojarra/job/2_mojarra-run-tck-against-staged-build_3_0/build) in menu
+11. Verify that a new [4.0.3](https://github.com/eclipse-ee4j/mojarra/branches/active) branch is created 
+12. Verify that a new [4.0.3-RELEASE](https://github.com/eclipse-ee4j/mojarra/tags) tag is created 
+13. Open [2_mojarra-run-tck-against-staged-build_4_0](https://ci.eclipse.org/mojarra/job/2_mojarra-run-tck-against-staged-build_4_0) (there are separate ones for 2.3 and 3.0)
+14. Click [Build with parameters](https://ci.eclipse.org/mojarra/job/2_mojarra-run-tck-against-staged-build_4_0/build) in menu
     - `IMPL_SOURCE` = `STAGE`
-    - `IMPL_VERSION` = `3.0.3`
-    - `IMPL_BRANCH` = `3.0`
+    - `IMPL_VERSION` = `4.0.3`
+    - `IMPL_BRANCH` = `4.0`
     - click [Build] button
 15. Wait for it to finish successfully
 16. Open [3_mojarra-staging-to-release](https://ci.eclipse.org/mojarra/job/3_mojarra-staging-to-release/)
 17. Click [Build with parameters](https://ci.eclipse.org/mojarra/job/3_mojarra-staging-to-release/build) in menu
-    - `STAGING_RELEASE_ID` = `orgglassfish-1230`
+    - `STAGING_RELEASE_ID` = `orgglassfish-1273`
     - click [Build] button
 18. Wait for it to finish successfully
 19. Verify that it's present in [Maven Central](https://repo1.maven.org/maven2/org/glassfish/jakarta.faces/) (might take up to a hour)
-20. If everything is OK, then merge 3.0.3 branch into 3.0 via PR
-21. Delete the 3.0.3 branch after merge
+20. If everything is OK, then merge 4.0.3 branch into 4.0 via a PR
+21. Delete the 4.0.3 branch after merge
+22. Manage the [milestones](https://github.com/eclipse-ee4j/mojarra/milestones) page
+     - make sure all issues/PRs are linked to proper milestone
+     - close the milestones which were just released
+     - create new milestones for next releases