From f0487b051d09c2ef18c2b37c067e9b5e8e31b205 Mon Sep 17 00:00:00 2001
From: Kai Zimmermann <kai.zimmermann@bosch-si.com>
Date: Fri, 31 Mar 2017 17:37:58 +0200
Subject: [PATCH] Tomcat exclusion configured in parent. Jetty used as well in
 simulator. (#468)

* Tomcat exclusion configured in parent. jetty used as well in simulator.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix ident

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Add jetty to UAA example.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
---
 examples/hawkbit-custom-theme-example/pom.xml          | 4 ++++
 examples/hawkbit-device-simulator/pom.xml              | 4 ++++
 extensions/hawkbit-extension-uaa/pom.xml               | 4 ++++
 hawkbit-repository/hawkbit-repository-test/pom.xml     | 6 ------
 hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml  | 6 ------
 hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml | 6 ------
 hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml  | 6 ------
 pom.xml                                                | 6 ++++++
 8 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/examples/hawkbit-custom-theme-example/pom.xml b/examples/hawkbit-custom-theme-example/pom.xml
index 9baacc96c8..f747e95bb6 100644
--- a/examples/hawkbit-custom-theme-example/pom.xml
+++ b/examples/hawkbit-custom-theme-example/pom.xml
@@ -89,6 +89,10 @@
       <dependency>
          <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>
diff --git a/examples/hawkbit-device-simulator/pom.xml b/examples/hawkbit-device-simulator/pom.xml
index 1415e4dfd1..b3f612df4a 100644
--- a/examples/hawkbit-device-simulator/pom.xml
+++ b/examples/hawkbit-device-simulator/pom.xml
@@ -71,6 +71,10 @@
          <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-logging</artifactId>
diff --git a/extensions/hawkbit-extension-uaa/pom.xml b/extensions/hawkbit-extension-uaa/pom.xml
index 41516afbd6..bf9215ee95 100644
--- a/extensions/hawkbit-extension-uaa/pom.xml
+++ b/extensions/hawkbit-extension-uaa/pom.xml
@@ -45,6 +45,10 @@
          <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.security.oauth</groupId>
          <artifactId>spring-security-oauth2</artifactId>
diff --git a/hawkbit-repository/hawkbit-repository-test/pom.xml b/hawkbit-repository/hawkbit-repository-test/pom.xml
index 1832e46402..c1c2c2d270 100644
--- a/hawkbit-repository/hawkbit-repository-test/pom.xml
+++ b/hawkbit-repository/hawkbit-repository-test/pom.xml
@@ -46,12 +46,6 @@
       <dependency>
          <groupId>org.springframework.boot</groupId>
          <artifactId>spring-boot-starter-web</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>org.springframework.boot</groupId>
-               <artifactId>spring-boot-starter-tomcat</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.springframework.boot</groupId>
diff --git a/hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml b/hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml
index 043aeb49e5..d3152d977f 100644
--- a/hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml
+++ b/hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml
@@ -24,12 +24,6 @@
       <dependency>
          <groupId>org.springframework.boot</groupId>
          <artifactId>spring-boot-starter-web</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>org.springframework.boot</groupId>
-               <artifactId>spring-boot-starter-tomcat</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.springframework.boot</groupId>
diff --git a/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml b/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml
index ee083cc214..356c96e6cf 100644
--- a/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml
+++ b/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml
@@ -23,12 +23,6 @@
       <dependency>
          <groupId>org.springframework.boot</groupId>
          <artifactId>spring-boot-starter-web</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>org.springframework.boot</groupId>
-               <artifactId>spring-boot-starter-tomcat</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.springframework.boot</groupId>
diff --git a/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml b/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml
index 91c2997184..d362e0d1ed 100644
--- a/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml
+++ b/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml
@@ -23,12 +23,6 @@
       <dependency>
          <groupId>org.springframework.boot</groupId>
          <artifactId>spring-boot-starter-web</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>org.springframework.boot</groupId>
-               <artifactId>spring-boot-starter-tomcat</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.springframework.boot</groupId>
diff --git a/pom.xml b/pom.xml
index 93c415e645..e31418c40a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -604,6 +604,12 @@
             <groupId>org.springframework.boot</groupId>
             <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>
+            </exclusions>
          </dependency>
          <dependency>
             <groupId>org.springframework.boot</groupId>