You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by jo...@apache.org on 2022/06/29 04:32:17 UTC
[zeppelin] branch master updated: [ZEPPELIN-5434] Upgrade jetty version to 9.4.43.v20210629 (#4385)
This is an automated email from the ASF dual-hosted git repository.
jongyoul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new bd951ee53d [ZEPPELIN-5434] Upgrade jetty version to 9.4.43.v20210629 (#4385)
bd951ee53d is described below
commit bd951ee53d696a4d21a69f09f5cd7ba76f173a28
Author: Zoltan Holoda <zh...@cloudera.com>
AuthorDate: Wed Jun 29 06:32:08 2022 +0200
[ZEPPELIN-5434] Upgrade jetty version to 9.4.43.v20210629 (#4385)
* [ZEPPELIN-5434] Upgrade jetty version to 9.4.43.v20210629
* [ZEPPELIN-5434] Change servlet settings to support jetty 9.4.43.v20210629
Rename reserved default servlet name.
Don't use .setForcedPath("rest"), that's not what that method is for,
that method exists for JSP definitions from the WEB-INF/web.xml <jsp-file> definition.
servletHolder.setForcedPath("rest");
https://github.com/eclipse/jetty.project/issues/6592
---
pom.xml | 2 +-
.../org/apache/zeppelin/server/ZeppelinServer.java | 1 -
zeppelin-web/src/WEB-INF/web.xml | 34 ++++++++++++----------
3 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3ed67413b3..668bb99d70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
<flexmark.all.version>0.62.2</flexmark.all.version>
<gson.version>2.8.6</gson.version>
<gson-extras.version>0.2.2</gson-extras.version>
- <jetty.version>9.4.31.v20200723</jetty.version>
+ <jetty.version>9.4.43.v20210629</jetty.version>
<httpcomponents.core.version>4.4.1</httpcomponents.core.version>
<httpcomponents.client.version>4.5.13</httpcomponents.client.version>
<httpcomponents.asyncclient.version>4.0.2</httpcomponents.asyncclient.version>
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
index 35e574747f..7cb97a45a6 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
@@ -549,7 +549,6 @@ public class ZeppelinServer extends ResourceConfig {
servletHolder.setInitParameter("javax.ws.rs.Application", ZeppelinServer.class.getName());
servletHolder.setName("rest");
- servletHolder.setForcedPath("rest");
webapp.setSessionHandler(new SessionHandler());
webapp.addServlet(servletHolder, "/api/*");
diff --git a/zeppelin-web/src/WEB-INF/web.xml b/zeppelin-web/src/WEB-INF/web.xml
index c8162a5b9c..f7094028fe 100644
--- a/zeppelin-web/src/WEB-INF/web.xml
+++ b/zeppelin-web/src/WEB-INF/web.xml
@@ -16,29 +16,31 @@
~ limitations under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
- version="3.0">
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+ version="3.0">
- <display-name>zeppelin-web</display-name>
- <servlet>
- <servlet-name>default</servlet-name>
+ <display-name>zeppelin-web</display-name>
+ <servlet>
+ <servlet-name>restServlet</servlet-name>
<servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
<init-param>
<param-name>jersey.config.server.provider.packages</param-name>
<param-value>org.apache.zeppelin.rest</param-value>
</init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <error-page>
- <error-code>404</error-code>
- <location>/WEB-INF/404.html</location>
- </error-page>
- <context-param>
- <param-name>configuration</param-name>
- <param-value>deployment</param-value>
- </context-param>
+ <error-page>
+ <error-code>404</error-code>
+ <location>/WEB-INF/404.html</location>
+ </error-page>
+
+ <context-param>
+ <param-name>configuration</param-name>
+ <param-value>deployment</param-value>
+ </context-param>
<session-config>
<cookie-config>