Spring Boot 2.0 (#721)

* Migration to Boot 2.0.

Signed-off-by: Kai Zimmermann <kai.zimmermann@microsoft.com>

hawkbit-runtime/hawkbit-update-server/pom.xml

@@ -51,10 +51,6 @@
          <artifactId>hawkbit-boot-starter</artifactId>
          <version>${project.version}</version>
       </dependency>
-      <dependency>
-         <groupId>org.springframework.boot</groupId>
-         <artifactId>spring-boot-starter-actuator</artifactId>
-      </dependency>
       <dependency>
          <groupId>com.h2database</groupId>
          <artifactId>h2</artifactId>

hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/StreamAwareErrorController.java

@@ -11,9 +11,9 @@ package org.eclipse.hawkbit.app;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.springframework.boot.autoconfigure.web.BasicErrorController;
-import org.springframework.boot.autoconfigure.web.ErrorAttributes;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
+import org.springframework.boot.autoconfigure.web.servlet.error.BasicErrorController;
+import org.springframework.boot.web.servlet.error.ErrorAttributes;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -26,6 +26,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
  *
  */
 @Controller
+// Exception squid:S3752 - errors need handling for all methods
+@SuppressWarnings("squid:S3752")
 public class StreamAwareErrorController extends BasicErrorController {
 
     /**

hawkbit-runtime/hawkbit-update-server/src/main/resources/application-cloudsandbox.properties

@@ -7,12 +7,14 @@
 # http://www.eclipse.org/legal/epl-v10.html
 #
 
+
 server.tomcat.protocol-header=X-Forwarded-Proto
+# IBM Adresses unpredictable
 server.tomcat.internal-proxies=.*
 
 # Sandbox, small files only
-spring.http.multipart.max-file-size=100KB
-spring.http.multipart.max-request-size=-1
+spring.servlet.multipart.max-file-size=100KB
+spring.servlet.multipart.max-request-size=-1
 
 ## Configuration for building download URLs - START
 hawkbit.artifact.url.protocols.download-http.rel=download-http
@@ -27,12 +29,12 @@ hawkbit.artifact.url.protocols.md5sum-http.hostname=${hawkbit.artifact.url.proto
 hawkbit.artifact.url.protocols.md5sum-http.ref=${hawkbit.artifact.url.protocols.download-http.ref}.MD5SUM
 ## Configuration for building download URLs - END
 
-security.user.name=demo
-security.user.password=demo
-security.require-ssl=false
+spring.security.user.name=demo
+spring.security.user.password={noop}demo
+hawkbit.server.security.require-ssl=true
 
-hawkbit.server.ui.demo.user=${security.user.name}
-hawkbit.server.ui.demo.password=${security.user.name}
+hawkbit.server.ui.demo.user=${spring.security.user.name}
+hawkbit.server.ui.demo.password=${spring.security.user.name}
 hawkbit.server.ui.demo.disclaimer=<small>By signing in, you consent that we store the following data for up to one week: \
   <ul><li><b>IP-Address:</b> Your client's IP-Address, as well as, the IP-Address of any device you connect to the \
   application are stored for the purpose of misuse prevention.</li></ul>\

hawkbit-runtime/hawkbit-update-server/src/main/resources/application.properties

@@ -8,8 +8,9 @@
 #
 
 # User Security
-security.user.name=admin
-security.user.password=admin
+spring.security.user.name=admin
+spring.security.user.password={noop}admin
+spring.main.allow-bean-definition-overriding=true
 
 # DDI authentication configuration
 hawkbit.server.ddi.security.authentication.anonymous.enabled=false
@@ -22,38 +23,6 @@ hawkbit.server.repository.publish-target-poll-event=false
 ## Configuration for DMF/RabbitMQ integration
 spring.rabbitmq.username=guest
 spring.rabbitmq.password=guest
-spring.rabbitmq.virtualHost=/
+spring.rabbitmq.virtual-host=/
 spring.rabbitmq.host=localhost
 spring.rabbitmq.port=5672
-
-# Monitoring
-endpoints.health.enabled=true
-
-# UI Localization
-hawkbit.server.ui.localization.defaultLocal=en
-hawkbit.server.ui.localization.availableLocals=en,de
-
-# UI demo account
-hawkbit.server.ui.demo.password=admin
-hawkbit.server.ui.demo.user=admin
-hawkbit.server.ui.demo.tenant=DEFAULT
-
-# Upload of large files
-spring.http.multipart.max-file-size=1024MB
-spring.http.multipart.max-request-size=-1
-
-# UI Favicon
-spring.mvc.favicon.enabled=false
-
-# UI help links
-hawkbit.server.ui.links.documentation.root=https://www.eclipse.org/hawkbit/
-hawkbit.server.ui.links.documentation.security=https://www.eclipse.org/hawkbit/concepts/authentication/
-hawkbit.server.ui.links.documentation.rollout=https://www.eclipse.org/hawkbit/concepts/rollout-management/
-
-hawkbit.server.ui.links.documentation.deployment-view=https://www.eclipse.org/hawkbit/ui/#deployment-management
-hawkbit.server.ui.links.documentation.distribution-view=https://www.eclipse.org/hawkbit/ui/#distribution-management
-hawkbit.server.ui.links.documentation.rollout-view=https://www.eclipse.org/hawkbit/ui/#rollout-management
-hawkbit.server.ui.links.documentation.system-configuration-view=https://www.eclipse.org/hawkbit/ui/
-hawkbit.server.ui.links.documentation.targetfilter-view=https://www.eclipse.org/hawkbit/ui/
-hawkbit.server.ui.links.documentation.upload-view=https://www.eclipse.org/hawkbit/ui/
-hawkbit.server.ui.links.documentation.maintenance-window-view=http://www.quartz-scheduler.org/documentation/quartz-2.x/tutorials/crontrigger.html