From ef72b9b64a2ffa3f68f806aab224db8f45f4c7af Mon Sep 17 00:00:00 2001 From: Arjan Tijms Date: Tue, 7 May 2024 15:59:52 +0200 Subject: [PATCH] Update various versions in pom, specifically Jakarta versions to final Signed-off-by: Arjan Tijms --- README.md | 52 ++++++++++++++++++++++---------------------------- action/pom.xml | 2 +- impl/pom.xml | 12 ++++++------ pom.xml | 6 +++--- rest/pom.xml | 4 ++-- 5 files changed, 35 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 86e9740e2c..2668d00808 100644 --- a/README.md +++ b/README.md @@ -14,30 +14,30 @@ [//]: # " SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 " --> -# Mojarra 4.0 +# Mojarra 4.1 -Eclipse's implementation of the Jakarta Faces 4.0 specification +Eclipse's implementation of the Jakarta Faces 4.1 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. ## Minimum Requirements -- Java 11 -- Jakarta Servlet 6.0 -- Jakarta Expression Language 5.0 -- CDI 4.0 -- Jakarta Standard Tag Library 2.0 -- Jakarta Web Socket 2.0 (optional, only when `` is used) -- Jakarta JSON Processing 2.0 (optional, only when `` is used) -- Jakarta Validation 3.0 (optional, only when `` or `` is used) +- Java 17 +- Jakarta Servlet 6.1 +- Jakarta Expression Language 6.0 +- jakarta CDI 4.1 +- Jakarta Web Socket 2.2 (optional, only when `` is used) +- Jakarta JSON Processing 2.1 (optional, only when `` is used) +- Jakarta Validation 3.1 (optional, only when `` or `` is used) -CDI is explicitly required because since Jakarta Faces 2.3 the `javax.faces.bean.*` annotations such as `@ManagedBean` are deprecated, and in 4.0 these have been removed. Several implicit Jakarta Expression Language objects are produced via CDI producers, and `` manages the Jakarta WebSocket sessions and events via CDI. +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 `` 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.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. +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. ### Non-Maven @@ -52,12 +52,11 @@ In case you're manually carrying around JARs: Add below JARs to `/WEB-INF/lib`: - - [`jakarta.faces.4.0.x.jar`][9] - - [`weld-servlet-shaded-4.0.0.Final.jar`][10] - - [`jstl-2.0.jar`][11] - - [`jakarta.json-api-2.0.jar`][12] (optional, only when `` is used) - - [`jakarta.json-2.0.jar`][12a] (optional, only when `` is used) - - [`validation-api-3.0.0.Final.jar`][13] (optional, only when `` is used) + - [`jakarta.faces.4.1.x.jar`][9] + - [`weld-servlet-shaded-4.1.0.Final.jar`][10] + - [`jakarta.json-api-2.1.0.jar`][12] (optional, only when `` is used) + - [`jakarta.json-2.1.0.jar`][12a] (optional, only when `` is used) + - [`jakarta.validation-api-3.1.0.jar`][13] (optional, only when `` is used) - [`hibernate-validator-8.0.x.Final.jar`][14] (optional, only when `` is used) Substitute `x` with latest version number available. @@ -72,7 +71,7 @@ In case you're using Maven, you can find below the necessary coordinates: jakarta.platform jakarta.jakartaee-api - 10.0.0 + 11.0.0 provided ``` @@ -90,17 +89,12 @@ In case of WildFly/JBoss EAP, [you need to manually package `jsf-api.jar` and `j org.jboss.weld.servlet weld-servlet-shaded - 4.0.0.Final - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - 2.0.0 + 4.1.0.Final org.glassfish jakarta.json - 2.0.0 + 2.1.0 org.hibernate.validator @@ -228,9 +222,9 @@ Finally create a [Facelets][20] file `/hello.xhtml` as below: Start the server and open it by `http://localhost:8080/contextname/hello.xhtml`. -## Activating CDI in Jakarta Faces 4.0 +## Activating CDI in Jakarta Faces 4.1 -CDI is activated by default in Jakarta Faces 4.0 and can´t be deactivated. +CDI is activated by default in Jakarta Faces 4.1 and can´t be deactivated. It´s not required anymore to add `@FacesConfig` to a CDI managed bean to accomplish this. As of Jakarta Faces 4.0 `@FacesConfig` still removes the need to explicitly add a `FacesServlet` entry to `web.xml`. @@ -240,7 +234,7 @@ In case you want to checkout this repository and manually build from source your ### Jakarta Faces.Next -1. Make sure that you have JDK 11, Ant and Maven installed. +1. Make sure that you have JDK 17, Ant and Maven installed. 2. Checkout branch [`master`][28]. 3. Run the following commands from the root directory of the project: diff --git a/action/pom.xml b/action/pom.xml index 5acbfe2bb6..895aeae617 100644 --- a/action/pom.xml +++ b/action/pom.xml @@ -41,7 +41,7 @@ jakarta.servlet jakarta.servlet-api - 6.1.0-M2 + 6.1.0 provided diff --git a/impl/pom.xml b/impl/pom.xml index 7b1d24be22..6aac2895b5 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -50,20 +50,20 @@ jakarta.servlet jakarta.servlet-api - 6.1.0-M2 + 6.1.0 provided jakarta.websocket jakarta.websocket-api - 2.2.0-M1 + 2.2.0 provided jakarta.websocket jakarta.websocket-client-api - 2.2.0-M1 + 2.2.0 provided @@ -91,7 +91,7 @@ jakarta.validation jakarta.validation-api - 3.1.0-M1 + 3.1.0 provided @@ -125,7 +125,7 @@ jakarta.persistence jakarta.persistence-api - 3.2.0-M2 + 3.2.0 provided true @@ -221,7 +221,7 @@ com.github.blutorange closure-compiler-maven-plugin - 2.28.0 + 2.30.0 diff --git a/pom.xml b/pom.xml index 575aaa8a88..adecbfe027 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ - + maven-enforcer-plugin @@ -74,7 +74,7 @@ - 3.6.0 + 3.8.6 @@ -85,7 +85,7 @@ maven-compiler-plugin - 3.12.1 + 3.13.0 17 -Xlint:unchecked diff --git a/rest/pom.xml b/rest/pom.xml index e4d1f4b49f..8c9db65e86 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -41,13 +41,13 @@ jakarta.servlet jakarta.servlet-api - 6.1.0-M2 + 6.1.0 provided jakarta.json.bind jakarta.json.bind-api - 3.0.0 + 3.0.1 provided