Update Spring and CDI versions in BOM (#10530)

6 files changed, 17 insertions, 12 deletions

diff --git a/bom/pom.xml b/bom/pom.xml
index 124d8b2331..c8f299fe51 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -17,9 +17,9 @@
     <url>http://vaadin.com</url>
 
     <properties>
-        <vaadin.spring.version>3.0.0.alpha1</vaadin.spring.version>
+        <vaadin.spring.version>3.0.0.beta1</vaadin.spring.version>
         <vaadin.testbench.version>5.1.1</vaadin.testbench.version>
-        <vaadin.cdi.version>3.0.0.alpha2</vaadin.cdi.version>
+        <vaadin.cdi.version>3.0.0.beta1</vaadin.cdi.version>
         <vaadin.context-menu.version>2.0.0</vaadin.context-menu.version>
     </properties>
 
diff --git a/test/cdi/src/main/java/com/vaadin/test/cdi/views/AlwaysNewView.java b/test/cdi/src/main/java/com/vaadin/test/cdi/views/AlwaysNewView.java
index d2c3014052..eef9f05f59 100644
--- a/test/cdi/src/main/java/com/vaadin/test/cdi/views/AlwaysNewView.java
+++ b/test/cdi/src/main/java/com/vaadin/test/cdi/views/AlwaysNewView.java
@@ -1,8 +1,9 @@
 package com.vaadin.test.cdi.views;
 
 import com.vaadin.cdi.CDIView;
-import com.vaadin.cdi.ViewContextStrategy.Always;
+import com.vaadin.cdi.viewcontextstrategy.ViewContextByNavigation;
 
-@CDIView(value = "new", contextStrategy = Always.class)
+@CDIView(value = "new")
+@ViewContextByNavigation
 public class AlwaysNewView extends GreetingView {
 }
diff --git a/test/cdi/src/main/java/com/vaadin/test/cdi/views/DefaultView.java b/test/cdi/src/main/java/com/vaadin/test/cdi/views/DefaultView.java
index eb4494aa6d..bcaf5abccc 100644
--- a/test/cdi/src/main/java/com/vaadin/test/cdi/views/DefaultView.java
+++ b/test/cdi/src/main/java/com/vaadin/test/cdi/views/DefaultView.java
@@ -3,14 +3,15 @@ package com.vaadin.test.cdi.views;
 import javax.inject.Inject;
 
 import com.vaadin.cdi.CDIView;
-import com.vaadin.cdi.ViewContextStrategy.Always;
+import com.vaadin.cdi.viewcontextstrategy.ViewContextByNavigation;
 import com.vaadin.navigator.View;
 import com.vaadin.test.cdi.ThankYouService;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Notification;
 
-@CDIView(value = "", contextStrategy = Always.class)
+@CDIView(value = "")
+@ViewContextByNavigation
 public class DefaultView implements View {
 
     @Inject
diff --git a/test/cdi/src/main/java/com/vaadin/test/cdi/views/NameBasedView.java b/test/cdi/src/main/java/com/vaadin/test/cdi/views/NameBasedView.java
index cc4635bac0..5547dffd77 100644
--- a/test/cdi/src/main/java/com/vaadin/test/cdi/views/NameBasedView.java
+++ b/test/cdi/src/main/java/com/vaadin/test/cdi/views/NameBasedView.java
@@ -1,8 +1,9 @@
 package com.vaadin.test.cdi.views;
 
 import com.vaadin.cdi.CDIView;
-import com.vaadin.cdi.ViewContextStrategy.ViewName;
+import com.vaadin.cdi.viewcontextstrategy.ViewContextByName;
 
-@CDIView(value = "name", contextStrategy = ViewName.class)
+@CDIView(value = "name")
+@ViewContextByName
 public class NameBasedView extends GreetingView {
 }
diff --git a/test/cdi/src/main/java/com/vaadin/test/cdi/views/ParamBasedView.java b/test/cdi/src/main/java/com/vaadin/test/cdi/views/ParamBasedView.java
index 72198b3aa0..4056024614 100644
--- a/test/cdi/src/main/java/com/vaadin/test/cdi/views/ParamBasedView.java
+++ b/test/cdi/src/main/java/com/vaadin/test/cdi/views/ParamBasedView.java
@@ -1,8 +1,9 @@
 package com.vaadin.test.cdi.views;
 
 import com.vaadin.cdi.CDIView;
-import com.vaadin.cdi.ViewContextStrategy.ViewNameAndParameters;
+import com.vaadin.cdi.viewcontextstrategy.ViewContextByNameAndParameters;
 
-@CDIView(value = "param", contextStrategy = ViewNameAndParameters.class)
+@CDIView(value = "param")
+@ViewContextByNameAndParameters
 public class ParamBasedView extends GreetingView {
 }
diff --git a/test/cdi/src/main/java/com/vaadin/test/cdi/views/UIScopedView.java b/test/cdi/src/main/java/com/vaadin/test/cdi/views/UIScopedView.java
index 932191291e..dbc3ef623d 100644
--- a/test/cdi/src/main/java/com/vaadin/test/cdi/views/UIScopedView.java
+++ b/test/cdi/src/main/java/com/vaadin/test/cdi/views/UIScopedView.java
@@ -2,9 +2,10 @@ package com.vaadin.test.cdi.views;
 
 import com.vaadin.cdi.CDIView;
 import com.vaadin.cdi.UIScoped;
-import com.vaadin.cdi.ViewContextStrategy.Always;
+import com.vaadin.cdi.viewcontextstrategy.ViewContextByNavigation;
 
 @UIScoped
-@CDIView(value = "persisting", contextStrategy = Always.class)
+@CDIView(value = "persisting")
+@ViewContextByNavigation
 public class UIScopedView extends GreetingView {
 }