Updated dependency versions

arjantijms · senivam · commit 88ed8902b802 · 2021-12-16T15:19:18.000+01:00
For GlassFish 7 and other OSGi containers, make sure Servlet 6 is a
tolerated version number.

Signed-off-by: arjantijms &lt;arjan.tijms@gmail.com&gt;
diff --git a/ext/mvc-jsp/pom.xml b/ext/mvc-jsp/pom.xml
@@ -54,7 +54,7 @@
                     <instructions>
                         <Import-Package>
                             jakarta.servlet.jsp.*;version="[3.0,4.0)",
-                            jakarta.servlet.*;version="!",
+                            jakarta.servlet.*;version="[5.0,7.0)",
                             *
                         </Import-Package>
                         <Export-Package>org.glassfish.jersey.server.mvc.jsp.*;version=${project.version}</Export-Package>
diff --git a/ext/mvc/pom.xml b/ext/mvc/pom.xml
@@ -67,7 +67,7 @@
                 <configuration>
                     <instructions>
                         <Export-Package>org.glassfish.jersey.server.mvc.*;version=${project.version}</Export-Package>
-                        <Import-Package>${jakarta.annotation.osgi.version},*</Import-Package>
+                        <Import-Package> jakarta.servlet.*;version="[5.0,7.0)",${jakarta.annotation.osgi.version},*</Import-Package>
                     </instructions>
                     <unpackBundle>true</unpackBundle>
                 </configuration>

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@`
`54`	`54`	`<instructions>`
`55`	`55`	`<Import-Package>`
`56`	`56`	`jakarta.servlet.jsp.*;version="[3.0,4.0)",`
`57`		`- jakarta.servlet.*;version="!",`
	`57`	`+ jakarta.servlet.*;version="[5.0,7.0)",`
`58`	`58`	`*`
`59`	`59`	`</Import-Package>`
`60`	`60`	`<Export-Package>org.glassfish.jersey.server.mvc.jsp.*;version=${project.version}</Export-Package>`