Skip to content

Commit f0487b0

Browse files
authored
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>
1 parent 09c56f3 commit f0487b0

File tree

8 files changed

+18
-24
lines changed
  • examples
  • extensions/hawkbit-extension-uaa
  • hawkbit-repository/hawkbit-repository-test
  • hawkbit-starters
    • hawkbit-boot-starter-ddi-api
    • hawkbit-boot-starter-mgmt-api
    • hawkbit-boot-starter-mgmt-ui

8 files changed

+18
-24
lines changed

examples/hawkbit-custom-theme-example/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@
8989
<dependency>
9090
<groupId>org.springframework.boot</groupId>
9191
<artifactId>spring-boot-starter-web</artifactId>
92+
</dependency>
93+
<dependency>
94+
<groupId>org.springframework.boot</groupId>
95+
<artifactId>spring-boot-starter-jetty</artifactId>
9296
</dependency>
9397
<dependency>
9498
<groupId>org.springframework.boot</groupId>

examples/hawkbit-device-simulator/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@
7171
<groupId>org.springframework.boot</groupId>
7272
<artifactId>spring-boot-starter-web</artifactId>
7373
</dependency>
74+
<dependency>
75+
<groupId>org.springframework.boot</groupId>
76+
<artifactId>spring-boot-starter-jetty</artifactId>
77+
</dependency>
7478
<dependency>
7579
<groupId>org.springframework.boot</groupId>
7680
<artifactId>spring-boot-starter-logging</artifactId>

extensions/hawkbit-extension-uaa/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
<groupId>org.springframework.boot</groupId>
4646
<artifactId>spring-boot-starter-web</artifactId>
4747
</dependency>
48+
<dependency>
49+
<groupId>org.springframework.boot</groupId>
50+
<artifactId>spring-boot-starter-jetty</artifactId>
51+
</dependency>
4852
<dependency>
4953
<groupId>org.springframework.security.oauth</groupId>
5054
<artifactId>spring-security-oauth2</artifactId>

hawkbit-repository/hawkbit-repository-test/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,6 @@
4646
<dependency>
4747
<groupId>org.springframework.boot</groupId>
4848
<artifactId>spring-boot-starter-web</artifactId>
49-
<exclusions>
50-
<exclusion>
51-
<groupId>org.springframework.boot</groupId>
52-
<artifactId>spring-boot-starter-tomcat</artifactId>
53-
</exclusion>
54-
</exclusions>
5549
</dependency>
5650
<dependency>
5751
<groupId>org.springframework.boot</groupId>

hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@
2424
<dependency>
2525
<groupId>org.springframework.boot</groupId>
2626
<artifactId>spring-boot-starter-web</artifactId>
27-
<exclusions>
28-
<exclusion>
29-
<groupId>org.springframework.boot</groupId>
30-
<artifactId>spring-boot-starter-tomcat</artifactId>
31-
</exclusion>
32-
</exclusions>
3327
</dependency>
3428
<dependency>
3529
<groupId>org.springframework.boot</groupId>

hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@
2323
<dependency>
2424
<groupId>org.springframework.boot</groupId>
2525
<artifactId>spring-boot-starter-web</artifactId>
26-
<exclusions>
27-
<exclusion>
28-
<groupId>org.springframework.boot</groupId>
29-
<artifactId>spring-boot-starter-tomcat</artifactId>
30-
</exclusion>
31-
</exclusions>
3226
</dependency>
3327
<dependency>
3428
<groupId>org.springframework.boot</groupId>

hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@
2323
<dependency>
2424
<groupId>org.springframework.boot</groupId>
2525
<artifactId>spring-boot-starter-web</artifactId>
26-
<exclusions>
27-
<exclusion>
28-
<groupId>org.springframework.boot</groupId>
29-
<artifactId>spring-boot-starter-tomcat</artifactId>
30-
</exclusion>
31-
</exclusions>
3226
</dependency>
3327
<dependency>
3428
<groupId>org.springframework.boot</groupId>

pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,12 @@
604604
<groupId>org.springframework.boot</groupId>
605605
<artifactId>spring-boot-starter-web</artifactId>
606606
<version>${spring.boot.version}</version>
607+
<exclusions>
608+
<exclusion>
609+
<groupId>org.springframework.boot</groupId>
610+
<artifactId>spring-boot-starter-tomcat</artifactId>
611+
</exclusion>
612+
</exclusions>
607613
</dependency>
608614
<dependency>
609615
<groupId>org.springframework.boot</groupId>

0 commit comments

Comments
 (0)