Fixes joshlong-attic#15: Wrong version in modules and outdated spring…

…-boot version
MichaelF25 · Nov 6, 2014 · 1f0e1b3 · 1f0e1b3
1 parent ef9c9a2
commit 1f0e1b3
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>