Skip to content

[ZEPPELIN-6158] Update Jetty and other libraries to use Jakarta #4902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Reamer merged 8 commits into from
Apr 17, 2025
Merged

[ZEPPELIN-6158] Update Jetty and other libraries to use Jakarta #4902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8970b04
Update to jetty 11 and migrate to jakarta
Reamer Dec 14, 2024
ed3a2d8
fix shell interpreter
Reamer Dec 14, 2024
7f838ac
Disable WADL-Feature, which is not needed and results in warnings
Reamer Dec 17, 2024
902b6e3
Update jackson
Reamer Dec 17, 2024
5e4463d
Update kubernetes-client because of jackson update
Reamer Dec 17, 2024
5245f04
Fix jaxb for minihadoop
Reamer Dec 17, 2024
c6cb4eb
Update license file
Reamer Dec 18, 2024
caf19cf
Update jackson to 2.18.3
Reamer Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 10 additions & 15 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,9 @@
<gson.version>2.8.9</gson.version>
<gson-extras.version>0.2.2</gson-extras.version>
<org-json.version>20240205</org-json.version>
<jackson.version>2.12.7.20240502</jackson.version>
<jetty.version>9.4.52.v20230823</jetty.version>
<jakarta.activation.version>1.2.2</jakarta.activation.version>
<jakarta.xml.bind.version>2.3.3</jakarta.xml.bind.version>
<jackson.version>2.18.3</jackson.version>
<jetty.version>11.0.24</jetty.version>
<jakarta.inject.version>2.0.1</jakarta.inject.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>
Expand All @@ -140,8 +139,8 @@
<shiro.version>1.13.0</shiro.version>
<bouncycastle.version>1.80</bouncycastle.version>
<maven.version>3.6.3</maven.version>
<dropwizard.version>4.1.14</dropwizard.version>
<micrometer.version>1.6.0</micrometer.version>
<dropwizard.version>4.2.29</dropwizard.version>
<micrometer.version>1.14.2</micrometer.version>
<findbugs.jsr305.version>3.0.2</findbugs.jsr305.version>

<hadoop.version>3.3.6</hadoop.version>
Expand Down Expand Up @@ -327,15 +326,9 @@
</dependency>

<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${jakarta.activation.version}</version>
</dependency>

<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jakarta.xml.bind.version}</version>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>${jakarta.inject.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -380,11 +373,13 @@
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
<version>${shiro.version}</version>
<classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId>
<version>${shiro.version}</version>
<classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
Expand Down
2 changes: 1 addition & 1 deletion shell/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>javax-websocket-server-impl</artifactId>
<artifactId>websocket-jakarta-server</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
Expand Down
18 changes: 10 additions & 8 deletions shell/src/main/java/org/apache/zeppelin/shell/terminal/TerminalThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@

package org.apache.zeppelin.shell.terminal;

import javax.websocket.server.ServerContainer;
import javax.websocket.server.ServerEndpointConfig;
import jakarta.websocket.server.ServerEndpointConfig;

import org.apache.zeppelin.shell.terminal.websocket.TerminalSessionConfigurator;
import org.apache.zeppelin.shell.terminal.websocket.TerminalSocket;
Expand All @@ -27,7 +26,8 @@
import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.server.handler.ResourceHandler;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainerInitializer;

import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -47,6 +47,7 @@ public TerminalThread(int port, String allwedOrigin) {
this.allwedOrigin = allwedOrigin;
}

@Override
public void run() {
ServerConnector connector = new ServerConnector(jettyServer);
connector.setPort(port);
Expand Down Expand Up @@ -75,11 +76,12 @@ public void run() {
jettyServer.setHandler(handlers);

try {
ServerContainer container = WebSocketServerContainerInitializer.configureContext(context);
container.addEndpoint(
ServerEndpointConfig.Builder.create(TerminalSocket.class, "/")
.configurator(new TerminalSessionConfigurator(allwedOrigin))
.build());
JakartaWebSocketServletContainerInitializer.configure(context,
(servletContext, container) ->
container.addEndpoint(
ServerEndpointConfig.Builder.create(TerminalSocket.class, "/")
.configurator(new TerminalSessionConfigurator(allwedOrigin))
.build()));
jettyServer.start();
jettyServer.join();
} catch (Exception e) {
Expand Down
2 changes: 1 addition & 1 deletion shell/src/main/java/org/apache/zeppelin/shell/terminal/service/TerminalService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.websocket.Session;
import jakarta.websocket.Session;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.IOException;
Expand Down
8 changes: 4 additions & 4 deletions ...c/main/java/org/apache/zeppelin/shell/terminal/websocket/TerminalSessionConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

package org.apache.zeppelin.shell.terminal.websocket;

import javax.websocket.server.ServerEndpointConfig.Configurator;
import jakarta.websocket.server.ServerEndpointConfig.Configurator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class TerminalSessionConfigurator extends Configurator {
public class TerminalSessionConfigurator extends Configurator {
private static final Logger LOGGER = LoggerFactory.getLogger(TerminalSessionConfigurator.class);
private String allowedOrigin;

Expand All @@ -32,8 +32,8 @@ public TerminalSessionConfigurator(String allowedOrigin) {
@Override
public boolean checkOrigin(String originHeaderValue) {
boolean allowed = allowedOrigin.equals(originHeaderValue);
LOGGER.info("Checking origin for TerminalSessionConfigurator: " +
originHeaderValue + " allowed: " + allowed);
LOGGER.info("Checking origin for TerminalSessionConfigurator: {} allowed: {}",
originHeaderValue, allowed);
return allowed;
}
}
27 changes: 14 additions & 13 deletions shell/src/main/java/org/apache/zeppelin/shell/terminal/websocket/TerminalSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.websocket.ClientEndpoint;
import javax.websocket.CloseReason;
import javax.websocket.OnClose;
import javax.websocket.OnError;
import javax.websocket.OnMessage;
import javax.websocket.OnOpen;
import javax.websocket.Session;
import javax.websocket.server.ServerEndpoint;
import jakarta.websocket.ClientEndpoint;
import jakarta.websocket.CloseReason;
import jakarta.websocket.OnClose;
import jakarta.websocket.OnError;
import jakarta.websocket.OnMessage;
import jakarta.websocket.OnOpen;
import jakarta.websocket.Session;
import jakarta.websocket.server.ServerEndpoint;
import java.util.Map;

@ClientEndpoint
Expand All @@ -41,22 +41,23 @@ public class TerminalSocket {
private TerminalService terminalService;
private TerminalManager terminalManager = TerminalManager.getInstance();

private String noteId, paragraphId;
private String noteId;
private String paragraphId;

public TerminalSocket() {
terminalService = terminalManager.addTerminalService(this);
}

@OnOpen
public void onWebSocketConnect(Session sess) {
LOGGER.info("Socket Connected: " + sess);
LOGGER.info("Socket Connected: {}", sess);
terminalService.onWebSocketConnect(sess);
}

@OnMessage
public void onWebSocketText(String message) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Received TEXT message: " + message);
LOGGER.debug("Received TEXT message: {}", message);
}

Map<String, String> messageMap = getMessageMap(message);
Expand All @@ -77,14 +78,14 @@ public void onWebSocketText(String message) {
terminalService.onTerminalResize(messageMap.get("columns"), messageMap.get("rows"));
break;
default:
LOGGER.error("Unrecodnized action: " + message);
LOGGER.error("Unrecodnized action: {}", message);
}
}
}

@OnClose
public void onWebSocketClose(CloseReason reason) {
LOGGER.info("Socket Closed: " + reason);
LOGGER.info("Socket Closed: {}", reason);

terminalManager.onWebSocketClose(this, noteId, paragraphId);
}
Expand Down
16 changes: 8 additions & 8 deletions shell/src/test/java/org/apache/zeppelin/shell/TerminalInterpreterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import javax.websocket.ClientEndpointConfig;
import javax.websocket.ClientEndpointConfig.Builder;
import javax.websocket.ClientEndpointConfig.Configurator;
import jakarta.websocket.ClientEndpointConfig;
import jakarta.websocket.ClientEndpointConfig.Builder;
import jakarta.websocket.ClientEndpointConfig.Configurator;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterResult;
Expand All @@ -34,10 +34,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.websocket.ContainerProvider;
import javax.websocket.DeploymentException;
import javax.websocket.Session;
import javax.websocket.WebSocketContainer;
import jakarta.websocket.ContainerProvider;
import jakarta.websocket.DeploymentException;
import jakarta.websocket.Session;
import jakarta.websocket.WebSocketContainer;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
Expand Down Expand Up @@ -347,7 +347,7 @@ void testInvalidOrigin() {
}

assertTrue(exception instanceof IOException);
assertEquals("Connect failure", exception.getMessage());
assertTrue(exception.getMessage().contains("403 Forbidden"));
}

private static ClientEndpointConfig getOriginRequestHeaderConfig(String origin) {
Expand Down
12 changes: 6 additions & 6 deletions shell/src/test/java/org/apache/zeppelin/shell/terminal/TerminalSocketTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@

import java.util.ArrayList;
import java.util.List;
import javax.websocket.CloseReason;
import javax.websocket.Endpoint;
import javax.websocket.EndpointConfig;
import javax.websocket.Session;
import jakarta.websocket.CloseReason;
import jakarta.websocket.Endpoint;
import jakarta.websocket.EndpointConfig;
import jakarta.websocket.Session;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class TerminalSocketTest extends Endpoint {
private static final Logger LOGGER = LoggerFactory.getLogger(TerminalSocketTest.class);

public static final List<String> ReceivedMsg = new ArrayList();
public static final List<String> ReceivedMsg = new ArrayList<>();

@Override
public void onOpen(Session session, EndpointConfig endpointConfig) {
LOGGER.info("Socket Connected: " + session);

session.addMessageHandler(new javax.websocket.MessageHandler.Whole<String>() {
session.addMessageHandler(new jakarta.websocket.MessageHandler.Whole<String>() {
@Override
public void onMessage(String message) {
LOGGER.info("Received TEXT message: " + message);
Expand Down
2 changes: 1 addition & 1 deletion zeppelin-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-client</artifactId>
<artifactId>websocket-jetty-client</artifactId>
<version>${jetty.version}</version>
</dependency>

Expand Down
Loading
Loading