From 2749281c8de3a28dea56f399ee3d1bc495529f93 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Wed, 18 Mar 2020 11:07:12 -0400
Subject: [PATCH 1/4] Removes comment

---
 .../cloud/bus/endpoint/RefreshBusEndpoint.java                | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/endpoint/RefreshBusEndpoint.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/endpoint/RefreshBusEndpoint.java
index 15a6311..0024411 100644
--- a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/endpoint/RefreshBusEndpoint.java
+++ b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/endpoint/RefreshBusEndpoint.java
@@ -33,9 +33,7 @@ public class RefreshBusEndpoint extends AbstractBusEndpoint {
 	}
 
 	@WriteOperation
-	public void busRefreshWithDestination(@Selector String destination) { // TODO:
-																			// document
-																			// destination
+	public void busRefreshWithDestination(@Selector String destination) {
 		publish(new RefreshRemoteApplicationEvent(this, getInstanceId(), destination));
 	}
 

From dd8b788daa50033ed1a62fa6a2c274afacb505b3 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Wed, 18 Mar 2020 17:48:43 -0400
Subject: [PATCH 2/4] Updates to build 2.2.4.BUILD-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cc8a65e..355d5a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.3.RELEASE</version>
+		<version>2.2.4.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

From 0d2e892c1f85d31a302d52a3d7c07d11b4af6c0e Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Thu, 19 Mar 2020 10:52:02 -0400
Subject: [PATCH 3/4] Updates to build 2.3.0.BUILD-SNAPSHOT

---
 pom.xml                               | 2 +-
 spring-cloud-bus-dependencies/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 355d5a0..7d08998 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.4.BUILD-SNAPSHOT</version>
+		<version>2.3.0.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/spring-cloud-bus-dependencies/pom.xml b/spring-cloud-bus-dependencies/pom.xml
index 0f3d1aa..b25a729 100644
--- a/spring-cloud-bus-dependencies/pom.xml
+++ b/spring-cloud-bus-dependencies/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.2.4.BUILD-SNAPSHOT</version>
+		<version>2.3.0.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-bus-dependencies</artifactId>

From 837c468e687bbed720df1bb9cd494baf98b454da Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@pivotal.io>
Date: Thu, 2 Apr 2020 11:16:47 -0400
Subject: [PATCH 4/4] Use IdUtils to generate service id

---
 .../cloud/bus/BusEnvironmentPostProcessor.java         | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusEnvironmentPostProcessor.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusEnvironmentPostProcessor.java
index 859e32a..9503ccd 100644
--- a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusEnvironmentPostProcessor.java
+++ b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusEnvironmentPostProcessor.java
@@ -21,6 +21,7 @@ import java.util.Map;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.env.EnvironmentPostProcessor;
+import org.springframework.cloud.commons.util.IdUtils;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.MutablePropertySources;
@@ -44,17 +45,10 @@ public class BusEnvironmentPostProcessor implements EnvironmentPostProcessor {
 				+ ".content-type",
 				environment.getProperty("spring.cloud.bus.content-type",
 						"application/json"));
-		map.put("spring.cloud.bus.id", getDefaultServiceId(environment));
+		map.put("spring.cloud.bus.id", IdUtils.getUnresolvedServiceId());
 		addOrReplace(environment.getPropertySources(), map);
 	}
 
-	// TODO: move this to commons
-	// @checkstyle:off
-	private String getDefaultServiceId(ConfigurableEnvironment environment) {
-		return "${vcap.application.name:${spring.application.name:application}}:${vcap.application.instance_index:${spring.application.index:${local.server.port:${server.port:0}}}}:${vcap.application.instance_id:${random.value}}";
-	}
-	// @checkstyle:on
-
 	private void addOrReplace(MutablePropertySources propertySources,
 			Map<String, Object> map) {
 		MapPropertySource target = null;