From 2195a92d47f4484c165ebdc4e078e5a02228313c Mon Sep 17 00:00:00 2001
From: "Dr. Christoph \"Schorsch\" Jung" <c-jung@t-systems.com>
Date: Fri, 19 Jan 2024 12:33:26 +0100
Subject: [PATCH] fix: three different minor versions of tomcat mixed. cleanup
 for smooth runtime.

---
 DEPENDENCIES                        | 5 +----
 pom.xml                             | 2 +-
 remoting/src/main/docker/Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/DEPENDENCIES b/DEPENDENCIES
index e945e1b3..11bbc771 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -115,12 +115,9 @@ maven/mavencentral/org.apache.lucene/lucene-spatial-extras/8.9.0, Apache-2.0, ap
 maven/mavencentral/org.apache.lucene/lucene-spatial3d/8.9.0, Apache-2.0, approved, #6140
 maven/mavencentral/org.apache.solr/solr-solrj/8.9.0, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #6141
 maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/9.0.83, Apache-2.0 AND (CDDL-1.0 OR GPL-2.0 WITH Classpath-exception-2.0), approved, CQ20188
-maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/9.0.84, Apache-2.0 AND (CDDL-1.0 OR GPL-2.0 WITH Classpath-exception-2.0), approved, CQ20188
 maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/9.0.83, Apache-2.0, approved, CQ20193
-maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/9.0.84, Apache-2.0, approved, CQ20193
 maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/9.0.83, Apache-2.0, approved, CQ20194
-maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/9.0.84, Apache-2.0, approved, CQ20194
-maven/mavencentral/org.apache.tomcat/tomcat-annotations-api/9.0.84, , restricted, clearlydefined
+maven/mavencentral/org.apache.tomcat/tomcat-annotations-api/9.0.83, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.apache.yetus/audience-annotations/0.12.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.apache.zookeeper/zookeeper-jute/3.7.2, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.apache.zookeeper/zookeeper/3.7.2, Apache-2.0, approved, clearlydefined
diff --git a/pom.xml b/pom.xml
index 848cad1c..7d12cb38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
         <spring.version>5.3.31</spring.version>
         <spring.boot.version>2.7.18</spring.boot.version>
         <guava.version>32.1.2-jre</guava.version>
-        <tomcat.version>9.0.84</tomcat.version>
+        <tomcat.version>9.0.83</tomcat.version>
         <netty.version>4.1.94.Final</netty.version>
         <jetty.version>9.4.53.v20231009</jetty.version>
         <org.yaml.snakeyaml.version>2.0</org.yaml.snakeyaml.version>
diff --git a/remoting/src/main/docker/Dockerfile b/remoting/src/main/docker/Dockerfile
index 15d33e82..2ceb5443 100644
--- a/remoting/src/main/docker/Dockerfile
+++ b/remoting/src/main/docker/Dockerfile
@@ -85,7 +85,7 @@ RUN adduser \
 
 # Environment variables
 ENV TOMCAT_MAJOR=9 \
-    TOMCAT_VERSION=9.0.85 \
+    TOMCAT_VERSION=9.0.83 \
     CATALINA_HOME=/opt/tomcat
 
 RUN mkdir -p /opt