From 953b4e8dd40d8a6dc175c9c43f9356901ce4219e Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Tue, 2 Feb 2016 10:30:47 +0100
Subject: [PATCH] Polish contribution

`1.3.2.RELEASE` is available now so there is no need to have a version
range on the snapshot.  We don't need to copy/paste the version of the
bom in the actual dependency (that's the whole business of the bom
definition (including versions mapping according to the Spring Boot
version).

We want the `cloud-bom` to be automatically added when the data flow bom
is required so it is referenced as "additional BOM" as well.

Closes gh-189
---
 initializr-service/application.yml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/initializr-service/application.yml b/initializr-service/application.yml
index 48755387..22fe5e24 100644
--- a/initializr-service/application.yml
+++ b/initializr-service/application.yml
@@ -19,14 +19,6 @@ initializr:
         groupId: com.vaadin
         artifactId: vaadin-bom
         version: 7.5.5
-      cloud-dataflow-bom:
-        groupId: org.springframework.cloud
-        artifactId: spring-cloud-dataflow-dependencies
-        version: 1.0.0.BUILD-SNAPSHOT
-        mappings:
-          - versionRange: 1.3.2.BUILD-SNAPSHOT
-            version:  1.0.0.BUILD-SNAPSHOT
-            repositories: spring-snapshots,spring-milestones
       cloud-bom:
         groupId: org.springframework.cloud
         artifactId: spring-cloud-dependencies
@@ -36,6 +28,12 @@ initializr:
           - versionRange: "1.3.0.M2"
             version: Brixton.BUILD-SNAPSHOT
             repositories: spring-snapshots,spring-milestones
+      cloud-dataflow-bom:
+        groupId: org.springframework.cloud
+        artifactId: spring-cloud-dataflow-dependencies
+        version: 1.0.0.BUILD-SNAPSHOT
+        additionalBoms: [cloud-bom]
+        repositories: spring-snapshots,spring-milestones
   dependencies:
     - name: Core
       content:
@@ -456,12 +454,11 @@ initializr:
           artifactId: spring-cloud-starter-aws-messaging
     - name: Cloud Data Flow
       bom: cloud-dataflow-bom
-      versionRange: "1.0.0.BUILD-SNAPSHOT"
+      versionRange: "1.3.2.RELEASE"
       content:
         - name: Local Data Flow Server
           id: cloud-dataflow-server-local
           description: Local Data Flow Server implementation
-          versionRange: 1.0.0.BUILD-SNAPSHOT
           groupId: org.springframework.cloud
           artifactId: spring-cloud-starter-dataflow-server-local
     - name: Cloud Cluster