Merge pull request #294 from elmot/spring4-and-addon-1.1

Upgrade to Spring4 and vaadin-spring-1.1.SNAPSHOT
peholmst · Oct 27, 2016 · 568b675 · 568b675
2 parents 3fa9e08 + 65c30f0
commit 568b675
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/extensions/boot/src/test/java/org/vaadin/spring/boot/CustomServletOverrideTest.java b/extensions/boot/src/test/java/org/vaadin/spring/boot/CustomServletOverrideTest.java
@@ -19,7 +19,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.embedded.ServletRegistrationBean;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.ContextConfiguration;
@@ -59,7 +59,7 @@ MyCustomVaadinServlet vaadinServlet() {
 
     @Test
     public void customServletIsInjected() throws Exception {
-        Method getServlet = servletRegistrationBean.getClass().getDeclaredMethod("getServlet");
+        Method getServlet = ServletRegistrationBean.class.getDeclaredMethod("getServlet");
         getServlet.setAccessible(true);
         Servlet servlet = (Servlet) getServlet.invoke(servletRegistrationBean);
         assertTrue("expected MyCustomVaadinServlet, was " + servlet.getClass().getSimpleName(), servlet instanceof MyCustomVaadinServlet);

diff --git a/pom.xml b/pom.xml
@@ -83,12 +83,12 @@
         <project.build.encoding>UTF-8</project.build.encoding>
         <project.build.target>1.6</project.build.target>
         <project.build.source>1.6</project.build.source>
-        <vaadin.version>7.6.3</vaadin.version>
+        <vaadin.version>7.7.3</vaadin.version>
         <vaadin-touchkit.version>4.0.0</vaadin-touchkit.version>
-        <vaadin-spring.version>1.0.0</vaadin-spring.version>
-        <spring.version>4.2.4.RELEASE</spring.version>
-        <spring-boot.version>1.3.2.RELEASE</spring-boot.version>
-        <spring-security.version>4.0.3.RELEASE</spring-security.version>
+        <vaadin-spring.version>1.1-SNAPSHOT</vaadin-spring.version>
+        <spring.version>4.3.3.RELEASE</spring.version>
+        <spring-boot.version>1.4.1.RELEASE</spring-boot.version>
+        <spring-security.version>4.1.3.RELEASE</spring-security.version>
         <slf4j.version>1.7.10</slf4j.version>
         <logback.version>1.1.2</logback.version>
     </properties>
@@ -165,7 +165,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.11</version>
+                <version>4.12</version>
             </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>

diff --git a/samples/pom.xml b/samples/pom.xml
@@ -17,8 +17,8 @@
     <name>Vaadin4Spring Samples</name>
 
     <properties>
-        <vaadin.version>7.6.1</vaadin.version>
-        <vaadin-spring.version>1.0.0</vaadin-spring.version>
+        <vaadin.version>7.7.3</vaadin.version>
+        <vaadin-spring.version>1.1-SNAPSHOT</vaadin-spring.version>
     </properties>
 
     <dependencyManagement>
@@ -171,4 +171,4 @@
         <module>navigation-sample</module>
         <module>i18n-sample</module>
     </modules>
-</project>
+</project>