From 2eb2355843f66fee2e9e29885fdd79f0948f7f3f Mon Sep 17 00:00:00 2001
From: Roy Clarkson <rclarkson@pivotal.io>
Date: Mon, 11 Jan 2016 22:51:36 -0600
Subject: [PATCH 1/2] Add support for Spring Cloud Services starters

---
 initializr-service/application.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/initializr-service/application.yml b/initializr-service/application.yml
index afeb56f5..a4c75d57 100644
--- a/initializr-service/application.yml
+++ b/initializr-service/application.yml
@@ -36,6 +36,14 @@ initializr:
         version: 1.0.0.BUILD-SNAPSHOT
         additionalBoms: [cloud-bom]
         repositories: spring-snapshots,spring-milestones
+      scs-bom:
+        groupId: io.pivotal.spring.cloud
+        artifactId: spring-cloud-services-dependencies
+        mappings:
+          - versionRange: "[1.3.0.M2,1.3.5.RELEASE]"
+            version: 1.1.0.BUILD-SNAPSHOT
+            repositories: spring-snapshots,spring-milestones
+        additionalBoms: [cloud-bom]
     kotlin:
       version: 1.0.2
   dependencies:
@@ -551,6 +559,25 @@ initializr:
           description: Leadership election and global state with Etcd and spring-cloud-cluster-etcd
           groupId: org.springframework.cloud
           artifactId: spring-cloud-cluster-etcd
+    - name: Spring Cloud Services for Pivotal Cloud Foundry
+      bom: scs-bom
+      versionRange: 1.3.0.RELEASE
+      content:
+        - name: Config Client (Spring Cloud Services)
+          id: scs-config-client
+          description: Config client for Spring Cloud Services on Pivotal Cloud Foundry
+          groupId: io.pivotal.spring.cloud
+          artifactId: spring-cloud-services-starter-config-client
+        - name: Service Registry (Spring Cloud Services)
+          id: scs-service-registry
+          description: Eureka service discovery for Spring Cloud Services on Pivotal Cloud Foundry
+          groupId: io.pivotal.spring.cloud
+          artifactId: spring-cloud-services-starter-service-registry
+        - name: Circuit Breaker (Spring Cloud Services)
+          id: scs-circuit-breaker
+          description: Hystrix circuit breaker for Spring Cloud Services on Pivotal Cloud Foundry
+          groupId: io.pivotal.spring.cloud
+          artifactId: spring-cloud-services-starter-circuit-breaker
     - name: Social
       content:
         - name: Facebook

From 3ef2390fd1109f7226e9cc9b84a35c210adeb646 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 9 Jun 2016 14:41:41 +0200
Subject: [PATCH 2/2] Polish contribution

Closes gh-176
---
 initializr-service/application.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/initializr-service/application.yml b/initializr-service/application.yml
index a4c75d57..6f9381bd 100644
--- a/initializr-service/application.yml
+++ b/initializr-service/application.yml
@@ -39,10 +39,8 @@ initializr:
       scs-bom:
         groupId: io.pivotal.spring.cloud
         artifactId: spring-cloud-services-dependencies
-        mappings:
-          - versionRange: "[1.3.0.M2,1.3.5.RELEASE]"
-            version: 1.1.0.BUILD-SNAPSHOT
-            repositories: spring-snapshots,spring-milestones
+        version: 1.1.0.BUILD-SNAPSHOT
+        repositories: spring-snapshots,spring-milestones
         additionalBoms: [cloud-bom]
     kotlin:
       version: 1.0.2
@@ -559,23 +557,23 @@ initializr:
           description: Leadership election and global state with Etcd and spring-cloud-cluster-etcd
           groupId: org.springframework.cloud
           artifactId: spring-cloud-cluster-etcd
-    - name: Spring Cloud Services for Pivotal Cloud Foundry
+    - name: Pivotal Cloud Foundry
       bom: scs-bom
       versionRange: 1.3.0.RELEASE
       content:
-        - name: Config Client (Spring Cloud Services)
+        - name: Config Client (PCF)
           id: scs-config-client
-          description: Config client for Spring Cloud Services on Pivotal Cloud Foundry
+          description: Config client on Pivotal Cloud Foundry
           groupId: io.pivotal.spring.cloud
           artifactId: spring-cloud-services-starter-config-client
-        - name: Service Registry (Spring Cloud Services)
+        - name: Service Registry (PCF)
           id: scs-service-registry
-          description: Eureka service discovery for Spring Cloud Services on Pivotal Cloud Foundry
+          description: Eureka service discovery on Pivotal Cloud Foundry
           groupId: io.pivotal.spring.cloud
           artifactId: spring-cloud-services-starter-service-registry
-        - name: Circuit Breaker (Spring Cloud Services)
+        - name: Circuit Breaker (PCF)
           id: scs-circuit-breaker
-          description: Hystrix circuit breaker for Spring Cloud Services on Pivotal Cloud Foundry
+          description: Hystrix circuit breaker on Pivotal Cloud Foundry
           groupId: io.pivotal.spring.cloud
           artifactId: spring-cloud-services-starter-circuit-breaker
     - name: Social