From 822595c53a60a119828609c9887f361be0b99f22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Pro=C3=9F?= <b.pross@52north.org>
Date: Mon, 8 Jul 2024 14:03:41 +0200
Subject: [PATCH] Adjust assembly files and dockerfile

---
 src/assembly/aio.xml       | 4 ----
 src/assembly/deps.xml      | 3 +--
 src/main/docker/Dockerfile | 6 +++++-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/assembly/aio.xml b/src/assembly/aio.xml
index 01faebd..34c320c 100644
--- a/src/assembly/aio.xml
+++ b/src/assembly/aio.xml
@@ -12,10 +12,6 @@
       <useProjectArtifact>true</useProjectArtifact>
       <unpack>true</unpack>
       <scope>runtime</scope>
-      <excludes>
-        <exclude>com.sun.jersey:jersey-servlet</exclude>
-        <exclude>com.sun.jersey:jersey-server</exclude>
-      </excludes>
     </dependencySet>
   </dependencySets>
 </assembly>
diff --git a/src/assembly/deps.xml b/src/assembly/deps.xml
index 439fa9e..cc758b6 100644
--- a/src/assembly/deps.xml
+++ b/src/assembly/deps.xml
@@ -12,7 +12,6 @@
   <dependencySets>
     <dependencySet>
       <includes>
-        <include>com.sun.jersey:jersey-client</include>
         <include>org.opengis.cite:schema-utils</include>
       </includes>
       <outputDirectory>/</outputDirectory>
@@ -23,9 +22,9 @@
     <dependencySet>
       <excludes>
         <exclude>org.opengis.cite.teamengine:teamengine-spi</exclude>
-        <exclude>com.sun.jersey:jersey-client</exclude>
         <exclude>org.opengis.cite:schema-utils</exclude>
         <exclude>com.beust:jcommander</exclude>
+        <exclude>org.glassfish.jersey.*:*</exclude>
       </excludes>
       <outputDirectory>/</outputDirectory>
       <unpack>false</unpack>
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index bb1a104..dc35836 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,4 +1,6 @@
-FROM tomcat:7.0-jre8
+FROM tomcat:10.1-jre17
+
+RUN apt update && apt install -y unzip
 
 # add TEAM Engine webapp
 ADD maven/dependency/teamengine-web-*.war /root/
@@ -21,5 +23,7 @@ RUN cd /root/ && unzip -q ets-gpkg12-nsg-*-ctl.zip -d /root/te_base/scripts
 ADD maven/ets-gpkg12-nsg-*-deps.zip /root/
 RUN cd /root/ && unzip -q -o ets-gpkg12-nsg-*-deps.zip -d /usr/local/tomcat/webapps/teamengine/WEB-INF/lib
 
+RUN rm -R /root/te_base/scripts/note
+
 # run tomcat
 CMD ["catalina.sh", "run"]