Skip to content

Commit c8301f0

Browse files
OSV-3932: [ZEPPELIN-6158] Update Jetty and other libraries to use Jakarta - V2 - Add hadoop related dependencies
1 parent 91f6171 commit c8301f0

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

bin/zeppelin-daemon.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,10 @@ if [[ "${USE_HADOOP}" != "false" ]]; then
9292
if ! [ -x "$(command -v hadoop)" ]; then
9393
echo 'hadoop command is not in PATH when HADOOP_CONF_DIR is specified.'
9494
else
95-
ZEPPELIN_CLASSPATH+=":`hadoop classpath`"
95+
# hadoop classpath does not work after [ZEPPELIN-6158] Update Jetty and other libraries to use Jakarta
96+
# have to set relavent jars manually
97+
#ZEPPELIN_CLASSPATH+=":`hadoop classpath`"
98+
ZEPPELIN_CLASSPATH+=":/usr/odp/current/hadoop-client/*:/usr/odp/current/hadoop-client/client/shaded/*"
9699
fi
97100
fi
98101
fi

zeppelin-zengine/pom.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,30 @@
132132
<version>${jetty.version}</version>
133133
</dependency>
134134

135+
<dependency>
136+
<groupId>org.eclipse.jetty</groupId>
137+
<artifactId>jetty-security</artifactId>
138+
<version>${jetty.version}</version>
139+
</dependency>
140+
141+
<dependency>
142+
<groupId>com.fasterxml.woodstox</groupId>
143+
<artifactId>woodstox-core</artifactId>
144+
<version>5.4.0</version>
145+
</dependency>
146+
147+
<dependency>
148+
<groupId>org.codehaus.woodstox</groupId>
149+
<artifactId>stax2-api</artifactId>
150+
<version>4.2</version>
151+
</dependency>
152+
153+
<dependency>
154+
<groupId>com.google.re2j</groupId>
155+
<artifactId>re2j</artifactId>
156+
<version>1.1</version>
157+
</dependency>
158+
135159
<dependency>
136160
<groupId>org.eclipse.jetty.websocket</groupId>
137161
<artifactId>websocket-jetty-client</artifactId>

0 commit comments

Comments
 (0)