7494: Unable to view JMC Help Contents

Reviewed-by: hirt, aptmac
openjdk · Jan 10, 2022 · b65e351 · b65e351
1 parent f077a40
commit b65e351
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 6 deletions.
diff --git a/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.openjdk.jmc.rjmx,
  org.eclipse.jetty.io,
  org.eclipse.jetty.server,
  org.eclipse.jetty.servlet,
- org.eclipse.jetty.servlet-api,
+ jakarta.servlet-api,
  org.eclipse.jetty.websocket.api,
  org.eclipse.jetty.websocket.server,
  org.eclipse.jetty.websocket.servlet,

diff --git a/releng/platform-definitions/platform-definition-2020-06/platform-definition-2020-06.target b/releng/platform-definitions/platform-definition-2020-06/platform-definition-2020-06.target
@@ -45,7 +45,6 @@
             <unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-core" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-swt" version="2.0.0"/>
-            <unit id="org.eclipse.jetty.servlet-api" version="4.0.6"/>
             <unit id="org.eclipse.jetty.websocket.api" version="10.0.5"/>
             <unit id="org.eclipse.jetty.websocket.server" version="10.0.5"/>
             <unit id="org.eclipse.jetty.websocket.servlet" version="10.0.5"/>

diff --git a/releng/platform-definitions/platform-definition-2020-09/platform-definition-2020-09.target b/releng/platform-definitions/platform-definition-2020-09/platform-definition-2020-09.target
@@ -45,7 +45,6 @@
             <unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-core" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-swt" version="2.0.0"/>
-            <unit id="org.eclipse.jetty.servlet-api" version="4.0.6"/>
             <unit id="org.eclipse.jetty.websocket.api" version="10.0.5"/>
             <unit id="org.eclipse.jetty.websocket.server" version="10.0.5"/>
             <unit id="org.eclipse.jetty.websocket.servlet" version="10.0.5"/>

diff --git a/releng/platform-definitions/platform-definition-2020-12/platform-definition-2020-12.target b/releng/platform-definitions/platform-definition-2020-12/platform-definition-2020-12.target
@@ -45,7 +45,6 @@
             <unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-core" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-swt" version="2.0.0"/>
-            <unit id="org.eclipse.jetty.servlet-api" version="4.0.6"/>
             <unit id="org.eclipse.jetty.websocket.api" version="10.0.5"/>
             <unit id="org.eclipse.jetty.websocket.server" version="10.0.5"/>
             <unit id="org.eclipse.jetty.websocket.servlet" version="10.0.5"/>

diff --git a/releng/platform-definitions/platform-definition-2021-03/platform-definition-2021-03.target b/releng/platform-definitions/platform-definition-2021-03/platform-definition-2021-03.target
@@ -45,7 +45,6 @@
             <unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-core" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-swt" version="2.0.0"/>
-            <unit id="org.eclipse.jetty.servlet-api" version="4.0.6"/>
             <unit id="org.eclipse.jetty.websocket.api" version="10.0.5"/>
             <unit id="org.eclipse.jetty.websocket.server" version="10.0.5"/>
             <unit id="org.eclipse.jetty.websocket.servlet" version="10.0.5"/>

diff --git a/releng/platform-definitions/platform-definition-2021-06/platform-definition-2021-06.target b/releng/platform-definitions/platform-definition-2021-06/platform-definition-2021-06.target
@@ -45,7 +45,6 @@
             <unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-core" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-swt" version="2.0.0"/>
-            <unit id="org.eclipse.jetty.servlet-api" version="4.0.6"/>
             <unit id="org.eclipse.jetty.websocket.api" version="10.0.5"/>
             <unit id="org.eclipse.jetty.websocket.server" version="10.0.5"/>
             <unit id="org.eclipse.jetty.websocket.servlet" version="10.0.5"/>