From 649c714006f7530274a5325c90a004ae9d41b1f4 Mon Sep 17 00:00:00 2001
From: Marinov Avgustin <Avgustin.Marinov@bosch.io>
Date: Wed, 28 Jun 2023 16:19:41 +0300
Subject: [PATCH] [#1378] Switch to Tomcat

switch hawkBit web server to Tomcat (was Jetty)

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
---
 hawkbit-repository/hawkbit-repository-test/pom.xml     | 4 ----
 hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml  | 4 ----
 hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml | 4 ----
 hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml  | 4 ----
 hawkbit-ui/README.md                                   | 1 -
 pom.xml                                                | 4 ----
 6 files changed, 21 deletions(-)

diff --git a/hawkbit-repository/hawkbit-repository-test/pom.xml b/hawkbit-repository/hawkbit-repository-test/pom.xml
index c41ea9e12..9f14b6c6c 100644
--- a/hawkbit-repository/hawkbit-repository-test/pom.xml
+++ b/hawkbit-repository/hawkbit-repository-test/pom.xml
@@ -74,10 +74,6 @@
          <groupId>org.springframework.boot</groupId>
          <artifactId>spring-boot-starter-web</artifactId>
       </dependency>
-      <dependency>
-         <groupId>org.springframework.boot</groupId>
-         <artifactId>spring-boot-starter-jetty</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.springframework</groupId>
          <artifactId>spring-context-support</artifactId>
diff --git a/hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml b/hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml
index 9c01c7d17..6b4564d07 100644
--- a/hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml
+++ b/hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml
@@ -25,10 +25,6 @@
          <groupId>org.springframework.boot</groupId>
          <artifactId>spring-boot-starter-web</artifactId>
       </dependency>
-      <dependency>
-         <groupId>org.springframework.boot</groupId>
-         <artifactId>spring-boot-starter-jetty</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.springframework.boot</groupId>
          <artifactId>spring-boot-starter</artifactId>
diff --git a/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml b/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml
index 4b9ed1afa..0a5603db5 100644
--- a/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml
+++ b/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml
@@ -24,10 +24,6 @@
          <groupId>org.springframework.boot</groupId>
          <artifactId>spring-boot-starter-web</artifactId>
       </dependency>
-      <dependency>
-         <groupId>org.springframework.boot</groupId>
-         <artifactId>spring-boot-starter-jetty</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.springframework.boot</groupId>
          <artifactId>spring-boot-starter</artifactId>
diff --git a/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml b/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml
index 9a73d4b94..ad07d7b3a 100644
--- a/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml
+++ b/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml
@@ -24,10 +24,6 @@
          <groupId>org.springframework.boot</groupId>
          <artifactId>spring-boot-starter-web</artifactId>
       </dependency>
-      <dependency>
-         <groupId>org.springframework.boot</groupId>
-         <artifactId>spring-boot-starter-jetty</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.springframework.boot</groupId>
          <artifactId>spring-boot-starter</artifactId>
diff --git a/hawkbit-ui/README.md b/hawkbit-ui/README.md
index 4bf9d67da..9c6470db6 100644
--- a/hawkbit-ui/README.md
+++ b/hawkbit-ui/README.md
@@ -10,7 +10,6 @@ The SuperDevMode can be used to debug client side code without any browser plugi
 
 - Add required maven dependencies
 	- Add vaadin-client-compiler dependency
-	- Add jetty dependencies (version : 8.1x)
 - Set redirect property in the AppWidgetSet.gwt.xml module descriptor as follows
 	- < set-configuration-property name="devModeRedirectEnabled" value="true" />
 - Create launch configuration for the SuperDevMode 
diff --git a/pom.xml b/pom.xml
index 26596269f..801e798ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -784,10 +784,6 @@
             <artifactId>spring-boot-starter-web</artifactId>
             <version>${spring.boot.version}</version>
             <exclusions>
-               <exclusion>
-                  <groupId>org.springframework.boot</groupId>
-                  <artifactId>spring-boot-starter-tomcat</artifactId>
-               </exclusion>
                <exclusion>
                   <groupId>com.fasterxml.jackson.datatype</groupId>
                   <artifactId>jackson-datatype-jdk8</artifactId>