From ef9c9a2734a3494c3b18cd5c41c209ab226d1b5e Mon Sep 17 00:00:00 2001
From: "Forstner, Michael" <forstnerm@media-saturn.com>
Date: Thu, 6 Nov 2014 09:42:01 +0100
Subject: [PATCH 1/2] Fixes #15: Wrong version in modules and outdated
 spring-boot version

---
 websockets/src/main/resources/data.sql | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 websockets/src/main/resources/data.sql

diff --git a/websockets/src/main/resources/data.sql b/websockets/src/main/resources/data.sql
deleted file mode 100644
index e69de29..0000000

From 1f0e1b3b21092d0f5fc1ffdf5656290b09ea330f Mon Sep 17 00:00:00 2001
From: "Forstner, Michael" <forstnerm@media-saturn.com>
Date: Thu, 6 Nov 2014 09:45:26 +0100
Subject: [PATCH 2/2] Fixes #15: Wrong version in modules and outdated
 spring-boot version

---
 jersey/pom.xml          |  2 +-
 pom.xml                 |  3 ++-
 rest-and-mvc/pom.xml    |  2 +-
 vaadin/pom.xml          |  4 ++--
 velocity/pom.xml        |  2 +-
 websockets/pom.xml      |  2 +-
 x-auth-security/pom.xml | 21 +++++++++++++--------
 7 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/jersey/pom.xml b/jersey/pom.xml
index cc3cf2d..8197599 100644
--- a/jersey/pom.xml
+++ b/jersey/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>bootexamples</groupId>
         <artifactId>core</artifactId>
-        <version>1.0.0.RC4</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>jersey</artifactId>
 
diff --git a/pom.xml b/pom.xml
index 85eef28..f1e5f94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,11 +6,12 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.0.0.RELEASE</version>
+        <version>1.1.8.RELEASE</version>
     </parent>
     <packaging>pom</packaging>
     <groupId>bootexamples</groupId>
     <artifactId>core</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
 
     <properties>
         <java.version>1.7</java.version>
diff --git a/rest-and-mvc/pom.xml b/rest-and-mvc/pom.xml
index 1fe4950..e46124f 100644
--- a/rest-and-mvc/pom.xml
+++ b/rest-and-mvc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>bootexamples</groupId>
         <artifactId>core</artifactId>
-        <version>1.0.0.RC4</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>rest-and-mvc</artifactId>
     <dependencies>
diff --git a/vaadin/pom.xml b/vaadin/pom.xml
index c2ec82b..6fd08c5 100644
--- a/vaadin/pom.xml
+++ b/vaadin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>bootexamples</groupId>
         <artifactId>core</artifactId>
-        <version>1.0.0.RC4</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>vaadin</artifactId>
     <dependencies>
@@ -21,7 +21,7 @@
         </dependency>
         <dependency>
             <groupId>org.vaadin.spring</groupId>
-            <version>1.0-SNAPSHOT</version>
+            <version>0.0.2.1</version>
             <artifactId>spring-boot-vaadin</artifactId>
         </dependency>
         <dependency>
diff --git a/velocity/pom.xml b/velocity/pom.xml
index 9d440d2..46f241e 100644
--- a/velocity/pom.xml
+++ b/velocity/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>bootexamples</groupId>
         <artifactId>core</artifactId>
-        <version>1.0.0.RC4</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>velocity</artifactId>
     <dependencies>
diff --git a/websockets/pom.xml b/websockets/pom.xml
index 4b69d64..876d9ab 100644
--- a/websockets/pom.xml
+++ b/websockets/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>bootexamples</groupId>
         <artifactId>core</artifactId>
-        <version>1.0.0.RC4</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>websockets</artifactId>
diff --git a/x-auth-security/pom.xml b/x-auth-security/pom.xml
index e0ce106..2366c9c 100644
--- a/x-auth-security/pom.xml
+++ b/x-auth-security/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>bootexamples</groupId>
         <artifactId>core</artifactId>
-        <version>1.0.0.RC4</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
 
@@ -18,14 +18,19 @@
         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-framework-bom</artifactId>
+                <version>${spring.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-framework-bom</artifactId>
-            <version>${spring.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-        </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>bootstrap</artifactId>