From 8ad14d27619595e10ea290555111d172252298b1 Mon Sep 17 00:00:00 2001
From: Michael Kamprath <michael@kamprath.net>
Date: Thu, 23 Nov 2023 07:46:27 +0000
Subject: [PATCH] upgraded versions

---
 spark-qfs-swarm/jupyter-server/Dockerfile | 16 +---------------
 spark-qfs-swarm/worker-node/Dockerfile    |  4 ++--
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/spark-qfs-swarm/jupyter-server/Dockerfile b/spark-qfs-swarm/jupyter-server/Dockerfile
index 6493a6b..47a6a45 100644
--- a/spark-qfs-swarm/jupyter-server/Dockerfile
+++ b/spark-qfs-swarm/jupyter-server/Dockerfile
@@ -12,25 +12,11 @@ ENV SPARK_NLP_VERSION spark-nlp-spark32_2.12:3.4.4
 USER root
 RUN apt-get install -y g++
 RUN pip3 install \
-        notebook==6.4.12 \
-        jupyter_nbextensions_configurator \
-        jupyter_contrib_nbextensions \
+        notebook \
         yapf wget jupyter_server
 
 COPY start-jupyter.sh /
 
-USER spark
-RUN jupyter contrib nbextension install --user
-RUN jupyter nbextensions_configurator enable --user
-RUN jupyter nbextension enable toc2/main
-RUN jupyter nbextension enable codefolding/main
-RUN jupyter nbextension enable execute_time/ExecuteTime
-
-USER root
-RUN pip3 uninstall -y traitlets
-RUN pip3 install traitlets==5.9.0
-
-
 USER spark
 RUN mkdir -p /home/spark/jupyter/runtime \
  &&	mkdir -p /home/spark/jupyter/notebooks \
diff --git a/spark-qfs-swarm/worker-node/Dockerfile b/spark-qfs-swarm/worker-node/Dockerfile
index aa3e6d0..af4931c 100644
--- a/spark-qfs-swarm/worker-node/Dockerfile
+++ b/spark-qfs-swarm/worker-node/Dockerfile
@@ -16,10 +16,10 @@ MAINTAINER Michael Kamprath "https://github.com/michaelkamprath"
 #
 
 ARG QFS_VERSION=2.2.6
-ARG SPARK_VERSION=3.3.3
+ARG SPARK_VERSION=3.5.0
 ARG HADOOP_MAJOR_VERSION=3
 ARG HADOOP_VERSION=3.3.1
-ARG SCALA_VERSION=2.12.15
+ARG SCALA_VERSION=2.12.18
 
 RUN apt-get update \
  && apt-get install -y locales \