[
https://issues.apache.org/jira/browse/MYFACES-4262?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16677842#comment-16677842
]
ASF GitHub Bot commented on MYFACES-4262:
-----------------------------------------
tandraschko closed pull request #26: MYFACES-4262: Use correct version ranges
to import servlet-api
URL: https://github.com/apache/myfaces/pull/26
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/api/pom.xml b/api/pom.xml
index d729b9375..40a8956cc 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -410,8 +410,8 @@
<Import-Package>
javax.el;version="[1.0.0, 3.1.0)",
javax.validation*;version="[1.0.0, 2.0.0)",
- javax.servlet;version="[2.5.0, 4.0)",
- javax.servlet.http;version="[2.5.0, 4.0)",
+ javax.servlet;version="[3, 5)",
+ javax.servlet.http;version="[3, 5)",
javax.servlet.jsp;version="[2.1.0, 3.1)",
javax.servlet.jsp.jstl.core;version="[1.1.2, 2.0.0)",
javax.servlet.jsp.jstl.sql;version="[1.1.2, 2.0.0)",
diff --git a/bundle/pom.xml b/bundle/pom.xml
index 6889fc8b4..06ce5436c 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -88,12 +88,12 @@
javax.naming,
javax.persistence;version="[1.0.0,
3.0)";resolution:=optional,
javax.portlet;version="[1.0.0,
2.1)";resolution:=optional,
- javax.servlet;version="[2.5.0, 4.0)",
- javax.servlet.http;version="[2.5.0, 4.0)",
+ javax.servlet;version="[3, 5)",
+ javax.servlet.http;version="[3, 5)",
javax.servlet.jsp;version="[2.1.0, 3.1)",
javax.servlet.jsp.jstl.core;version="[1.1.2,
2.0.0)",
javax.servlet.jsp.tagext;version="[2.1.0, 3.1)",
- javax.servlet.annotation;version="[2.5.0,
4.0)";resolution:=optional,
+ javax.servlet.annotation;version="[3,
5)";resolution:=optional,
javax.validation.*;version="[1.0.0,
2.0.0)";resolution:=optional,
javax.xml.parsers,
org.apache;resolution:=optional,
diff --git a/impl/pom.xml b/impl/pom.xml
index 3cd026560..0c02a0490 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -749,12 +749,12 @@
javax.naming,
javax.persistence;version="[1.0.0,
2.1)";resolution:=optional,
javax.portlet;version="[1.0.0,
2.1)";resolution:=optional,
- javax.servlet;version="[3.0.0, 4.0)",
- javax.servlet.http;version="[3.0.0, 4.0)",
+ javax.servlet;version="[3, 5)",
+ javax.servlet.http;version="[3, 5)",
javax.servlet.jsp;version="[2.2.0, 3.1)",
javax.servlet.jsp.jstl.core;version="[1.1.2, 2.0.0)",
javax.servlet.jsp.tagext;version="[2.1.0,
3.1)",
- javax.servlet.annotation;version="[2.5.0,
4.0)";resolution:=optional,
+ javax.servlet.annotation;version="[3,
5)";resolution:=optional,
javax.xml.parsers,
org.apache;resolution:=optional,
org.apache.commons.beanutils;version="[1.8.3, 2.0.0)",
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> MyFaces 2.3 should import correct javax.servlet packages in OSGi
> ----------------------------------------------------------------
>
> Key: MYFACES-4262
> URL: https://issues.apache.org/jira/browse/MYFACES-4262
> Project: MyFaces Core
> Issue Type: Bug
> Components: JSR-372
> Affects Versions: 2.3.2
> Reporter: Grzegorz Grzybek
> Priority: Major
> Fix For: 2.3.3, 3.0.0-SNAPSHOT
>
>
> After fixing MYFACES-4141 with [this
> commit|https://github.com/apache/myfaces/commit/731e40cdb4ce5d336192b705c070e3c0f8175305],
> where servlet-api dependency was set to tomcat-servlet-api:9.0.2,
> myfaces-bundle should use correct imports of OSGi packages.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)