You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2024/01/04 09:59:44 UTC

(myfaces) branch 3.0.x updated: MYFACES-4641

This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch 3.0.x
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/3.0.x by this push:
     new 8b38949de MYFACES-4641
8b38949de is described below

commit 8b38949de3e379ce85bfcca1939bd94d5f101181
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Thu Jan 4 10:59:35 2024 +0100

    MYFACES-4641
---
 api/pom.xml    | 10 +++++-----
 bundle/pom.xml | 18 +++++++++---------
 impl/pom.xml   | 12 ++++++------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index a98e778e9..05bd92bc9 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -409,16 +409,16 @@
                                     *;version="${project.version}"
                                 </Export-Package>
                                 <Import-Package>
-                                    jakarta.el;version="[1.0.0, 3.1.0)",
-                                    jakarta.validation*;version="[1.0.0, 2.0.0)",
-                                    jakarta.servlet;version="[3, 5)",
-                                    jakarta.servlet.http;version="[3, 5)",
+                                    jakarta.el;version="[4.0.0, 5.0.0, 6.0.0)",
+                                    jakarta.validation*;version="[3.0.0, 4.0.0)",
+                                    jakarta.servlet;version="[5.0.0, 6.0.0, 7.0.0)",
+                                    jakarta.servlet.http;version="[5.0.0, 7.0.0)",
+                                    jakarta.faces.*;version="${project.version}"
                                     jakarta.servlet.jsp;version="[2.1.0, 3.1)",
                                     jakarta.servlet.jsp.jstl.core;version="[1.1.2, 2.0.0)",
                                     jakarta.servlet.jsp.jstl.sql;version="[1.1.2, 2.0.0)",
                                     jakarta.servlet.jsp.tagext;version="[2.1.0, 3.2)",
                                     org.apache.commons.logging;version="[1.1.1, 2.0.0)",
-                                    jakarta.faces.*;version="${project.version}"
                                 </Import-Package>
                                 <Require-Bundle>
                                     org.apache.myfaces.core.impl;bundle-version="${parsedVersion.osgiVersion}"
diff --git a/bundle/pom.xml b/bundle/pom.xml
index f6c02be7f..d0c1fb368 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -83,18 +83,17 @@
                             jakarta.annotation,
                             javax.crypto,
                             javax.crypto.spec,
-                            jakarta.ejb;resolution:=optional,
-                            jakarta.el;version="[1.0.0, 3.0.0)",
+                            jakarta.ejb;version="[3.0.0, 4.0.0, 5.0.0)";resolution:=optional,
+                            jakarta.el;version="[4.0.0, 5.0.0, 6.0.0)",
                             javax.naming,
-                            jakarta.persistence;version="[1.0.0, 3.0)";resolution:=optional,
-                            jakarta.portlet;version="[1.0.0, 2.1)";resolution:=optional,
-                            jakarta.servlet;version="[3, 5)",
-                            jakarta.servlet.http;version="[3, 5)",
-                            jakarta.servlet.jsp;version="[2.1.0, 3.1)",
+                            jakarta.persistence;version="[3.0.0, 3.1.0, 4.0.0)";resolution:=optional,
+                            javax.portlet;version="[1.0.0, 2.1)";resolution:=optional,
+                            jakarta.servlet;version="[5.0.0, 6.0.0, 7.0.0)",
+                            jakarta.servlet.http;version="[5.0.0, 6.0.0, 7.0.0)",
+                            jakarta.servlet.jsp;version="[2.2.0, 3.1)",
                             jakarta.servlet.jsp.jstl.core;version="[1.1.2, 2.0.0)",
                             jakarta.servlet.jsp.tagext;version="[2.1.0, 3.1)",
-                            jakarta.servlet.annotation;version="[3, 5)";resolution:=optional,
-                            jakarta.validation.*;version="[1.0.0, 2.0.0)";resolution:=optional,
+                            jakarta.servlet.annotation;version="[5.0.0, 6.0.0, 7.0.0)";resolution:=optional,
                             javax.xml.parsers,
                             org.apache;resolution:=optional,
                             org.apache.commons.beanutils;version="[1.8.3, 2.0.0)",
@@ -107,6 +106,7 @@
                             org.apache.jasper.el;resolution:=optional,
                             org.apache.el;resolution:=optional,
                             org.apache.tomcat;resolution:=optional,
+                            jakarta.faces.*;version="${project.version}",
                             *
                         </Import-Package>
                         <Embed-Dependency>*;type=!pom;inline=true</Embed-Dependency>
diff --git a/impl/pom.xml b/impl/pom.xml
index cb213d612..206c8cf4a 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -733,17 +733,17 @@
                                     jakarta.annotation,
                                     javax.crypto,
                                     javax.crypto.spec,
-                                    jakarta.ejb;resolution:=optional,
-                                    jakarta.el;version="[1.0.0, 3.1.0)",
+                                    jakarta.ejb;version="[3.0.0, 4.0.0, 5.0.0)";resolution:=optional,
+                                    jakarta.el;version="[4.0.0, 5.0.0, 6.0.0)",
                                     javax.naming,
-                                    jakarta.persistence;version="[1.0.0, 2.1)";resolution:=optional,
+                                    jakarta.persistence;version="[3.0.0, 3.1.0, 4.0.0)";resolution:=optional,
                                     javax.portlet;version="[1.0.0, 2.1)";resolution:=optional,
-                                    jakarta.servlet;version="[3, 5)",
-                                    jakarta.servlet.http;version="[3, 5)",
+                                    jakarta.servlet;version="[5.0.0, 6.0.0, 7.0.0)",
+                                    jakarta.servlet.http;version="[5.0.0, 6.0.0, 7.0.0)",
                                     jakarta.servlet.jsp;version="[2.2.0, 3.1)",
                                     jakarta.servlet.jsp.jstl.core;version="[1.1.2, 2.0.0)",
                                     jakarta.servlet.jsp.tagext;version="[2.1.0, 3.1)",
-                                    jakarta.servlet.annotation;version="[3, 5)";resolution:=optional,
+                                    jakarta.servlet.annotation;version="[5.0.0, 6.0.0, 7.0.0)";resolution:=optional,
                                     javax.xml.parsers,
                                     org.apache;resolution:=optional,
                                     org.apache.commons.beanutils;version="[1.8.3, 2.0.0)",