diff --git a/hawkbit-security-core/pom.xml b/hawkbit-security-core/pom.xml
index b90c59d05f..023bbc25d9 100644
--- a/hawkbit-security-core/pom.xml
+++ b/hawkbit-security-core/pom.xml
@@ -44,16 +44,12 @@
spring-security-core
- org.springframework.security
- spring-security-oauth2-client
-
+ org.springframework.boot
+ spring-boot-starter-oauth2-resource-server
+
- org.springframework.security
- spring-security-oauth2-resource-server
-
-
- org.springframework.security
- spring-security-oauth2-jose
+ org.springframework.boot
+ spring-boot-starter-oauth2-client
org.springframework.boot
diff --git a/hawkbit-ui/pom.xml b/hawkbit-ui/pom.xml
index a9e4181745..33fa4dc8a5 100644
--- a/hawkbit-ui/pom.xml
+++ b/hawkbit-ui/pom.xml
@@ -202,14 +202,9 @@
spring-security-web
- org.springframework.security
- spring-security-oauth2-client
-
-
- org.springframework.security
- spring-security-oauth2-jose
+ org.springframework.boot
+ spring-boot-starter-oauth2-client
-
com.vaadin
vaadin-themes
diff --git a/pom.xml b/pom.xml
index 1338ec4576..91f4e0b423 100644
--- a/pom.xml
+++ b/pom.xml
@@ -697,7 +697,17 @@
-
+
+ org.springframework.boot
+ spring-boot-starter-oauth2-client
+ ${spring.boot.version}
+
+
+ com.sun.mail
+ javax.mail
+
+
+
org.springframework.boot
spring-boot-starter-data-jpa