Fixed scopes. Updated vaadin spring.

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

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactView.java

@@ -44,6 +44,7 @@ import com.vaadin.server.Page;
 import com.vaadin.server.Page.BrowserWindowResizeEvent;
 import com.vaadin.server.Page.BrowserWindowResizeListener;
 import com.vaadin.spring.annotation.SpringView;
+import com.vaadin.spring.annotation.UIScope;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.DragAndDropWrapper;
 import com.vaadin.ui.GridLayout;
@@ -54,6 +55,7 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * Display artifacts upload view.
  */
+@UIScope
 @SpringView(name = UploadArtifactView.VIEW_NAME, ui = HawkbitUI.class)
 public class UploadArtifactView extends VerticalLayout implements View, BrowserWindowResizeListener {
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsLayout.java

@@ -121,18 +121,6 @@ public class ArtifactDetailsLayout extends VerticalLayout {
         }
     }
 
-    /**
-     * Initialize the artifact details layout in readonly mode (will not show
-     * the delete icon) .
-     * 
-     * @param readOnly
-     *            value true for read only.
-     */
-    // TODO kaizimmerm: fix this
-    public void init(final boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
     private void createComponents() {
         final String labelStr = artifactUploadState.getSelectedBaseSoftwareModule()
                 .map(softwareModule -> HawkbitCommonUtil.getFormattedNameVersion(softwareModule.getName(),

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/DistributionsView.java

@@ -47,6 +47,7 @@ import com.vaadin.server.Page;
 import com.vaadin.server.Page.BrowserWindowResizeEvent;
 import com.vaadin.server.Page.BrowserWindowResizeListener;
 import com.vaadin.spring.annotation.SpringView;
+import com.vaadin.spring.annotation.UIScope;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.UI;
@@ -55,6 +56,7 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * Manage distributions and distributions type view.
  */
+@UIScope
 @SpringView(name = DistributionsView.VIEW_NAME, ui = HawkbitUI.class)
 public class DistributionsView extends VerticalLayout implements View, BrowserWindowResizeListener {
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java

@@ -33,6 +33,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod;
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
 import com.vaadin.spring.annotation.SpringView;
+import com.vaadin.spring.annotation.UIScope;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.UI;
@@ -41,6 +42,7 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * View for custom target filter management.
  */
+@UIScope
 @SpringView(name = FilterManagementView.VIEW_NAME, ui = HawkbitUI.class)
 public class FilterManagementView extends VerticalLayout implements View {
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java

@@ -53,6 +53,7 @@ import com.vaadin.server.Page;
 import com.vaadin.server.Page.BrowserWindowResizeEvent;
 import com.vaadin.server.Page.BrowserWindowResizeListener;
 import com.vaadin.spring.annotation.SpringView;
+import com.vaadin.spring.annotation.UIScope;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.UI;
@@ -62,6 +63,7 @@ import com.vaadin.ui.VerticalLayout;
  * Target status and deployment management view.
  *
  */
+@UIScope
 @SpringView(name = DeploymentView.VIEW_NAME, ui = HawkbitUI.class)
 public class DeploymentView extends VerticalLayout implements View, BrowserWindowResizeListener {
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutView.java

@@ -34,11 +34,13 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod;
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
 import com.vaadin.spring.annotation.SpringView;
+import com.vaadin.spring.annotation.UIScope;
 import com.vaadin.ui.VerticalLayout;
 
 /**
  * Rollout management view.
  */
+@UIScope
 @SpringView(name = RolloutView.VIEW_NAME, ui = HawkbitUI.class)
 public class RolloutView extends VerticalLayout implements View {
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java

@@ -32,6 +32,7 @@ import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
 import com.vaadin.server.FontAwesome;
 import com.vaadin.spring.annotation.SpringView;
+import com.vaadin.spring.annotation.UIScope;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CustomComponent;
@@ -43,6 +44,7 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * Main UI for the system configuration view.
  */
+@UIScope
 @SpringView(name = TenantConfigurationDashboardView.VIEW_NAME, ui = HawkbitUI.class)
 public class TenantConfigurationDashboardView extends CustomComponent implements View, ConfigurationItemChangeListener {
 

pom.xml

@@ -115,7 +115,7 @@
       <!-- Spring boot version overrides - END -->
 
       <!-- Vaadin versions - START -->
-      <vaadin.spring.version>1.0.2</vaadin.spring.version>
+      <vaadin.spring.version>1.1.1</vaadin.spring.version>
       <vaadin.spring.addon.version>0.0.6.RELEASE</vaadin.spring.addon.version>
       <vaadin.version>7.7.3</vaadin.version>
       <vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>