Fix problems caused by upgrade to jstl version. (#5715)
* Fix problems caused by upgrade to jstl version. Signed-off-by: Jan Bartel <janb@webtide.com> * fix upperbound dependency Signed-off-by: olivier lamy <oliver.lamy@gmail.com> * add trailing / Signed-off-by: olivier lamy <oliver.lamy@gmail.com> Co-authored-by: Jan Bartel <janb@webtide.com>
This commit is contained in:
parent
af3883ae33
commit
00d324979f
|
@ -61,7 +61,7 @@
|
|||
<supportedProjectType>war</supportedProjectType>
|
||||
</supportedProjectTypes>
|
||||
<instructions>
|
||||
<Import-Package>jakarta.servlet.jsp.*;version="[5,6)",org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))",*</Import-Package>
|
||||
<Import-Package>jakarta.servlet.jsp.*;version="[3,4)",org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))",*</Import-Package>
|
||||
<Export-Package>!com.acme*</Export-Package>
|
||||
<!-- the test webapp is configured via a jetty xml file
|
||||
in order to add the security handler. -->
|
||||
|
|
|
@ -452,5 +452,11 @@
|
|||
<version>4.2.2.Final</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.sun.activation</groupId>
|
||||
<artifactId>jakarta.activation</artifactId>
|
||||
<version>2.0.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
|
|
@ -84,7 +84,7 @@
|
|||
jakarta.el;version="[4.0,5.0)",
|
||||
jakarta.servlet;version="[$(version;==;${servlet.api.version}),$(version;+;${servlet.api.version}))",
|
||||
jakarta.servlet.resources;version="[$(version;==;${servlet.api.version}),$(version;+;${servlet.api.version}))",
|
||||
jakarta.servlet.jsp.resources;version="[$(version;==;${servlet.api.version}),$(version;+;${servlet.api.version}))",
|
||||
jakarta.servlet.jsp.resources;version="[$(version;==;${jsp.api.version}),$(version;+;${jsp.api.version}))",
|
||||
jakarta.servlet.jsp;version="[$(version;==;${jsp.api.version}),$(version;+;${jsp.api.version}))",
|
||||
jakarta.servlet.jsp.el;version="[$(version;==;${jsp.api.version}),$(version;+;${jsp.api.version}))",
|
||||
jakarta.servlet.jsp.tagext;version="[$(version;==;${jsp.api.version}),$(version;+;${jsp.api.version}))",
|
||||
|
|
4
pom.xml
4
pom.xml
|
@ -27,8 +27,8 @@
|
|||
<servlet.api.version>5.0.1</servlet.api.version>
|
||||
<!-- change version in jetty-websocket/websocket-jakarta-server/src/main/config/modules/websocket-jakarta.mod -->
|
||||
<websocket.api.version>2.0.0</websocket.api.version>
|
||||
<jsp.version>10.0.0-1-M7</jsp.version>
|
||||
<jsp.api.version>5.0</jsp.api.version>
|
||||
<jsp.version>10.0.0-M10</jsp.version>
|
||||
<jsp.api.version>3.0</jsp.api.version>
|
||||
<annotation-api.version>2.0.0</annotation-api.version>
|
||||
<transaction-api.version>2.0.0-RC1</transaction-api.version>
|
||||
<mail-api.version>2.0.0-RC6</mail-api.version>
|
||||
|
|
|
@ -63,7 +63,7 @@ public class JakartaWebSocketTest
|
|||
@Test
|
||||
public void testChatEndpoint() throws Exception
|
||||
{
|
||||
URI uri = WSURI.toWebsocket(server.getServerURI().resolve("/demo-jetty-webapp/jakarta.websocket"));
|
||||
URI uri = WSURI.toWebsocket(server.getServerURI().resolve("/demo-jetty-webapp/jakarta.websocket/"));
|
||||
|
||||
WebSocketContainer container = ContainerProvider.getWebSocketContainer();
|
||||
|
||||
|
|
Loading…
Reference in New Issue