Upgrade to Spring 5.2.0.RC1, Spring Boot 2.2.0.M5, Reactor Core 3.3.0.M3 and Reactor Netty 0.9.0.M3

* also upgrade Gradle Git Properties and Versions plugins to latest
* finally support AppDetail#buildpackVersion

Author: pacphi

build.gradle

@@ -1,8 +1,8 @@
 plugins {
-    id 'com.gorylenko.gradle-git-properties' version '2.0.0'
-    id 'org.springframework.boot' version '2.2.0.M4'
+    id 'com.gorylenko.gradle-git-properties' version '2.1.0'
+    id 'org.springframework.boot' version '2.2.0.M5'
     id 'io.spring.dependency-management' version '1.0.8.RELEASE'
-    id 'com.github.ben-manes.versions' version '0.21.0'
+    id 'com.github.ben-manes.versions' version '0.22.0'
     id 'io.franzbecker.gradle-lombok' version '3.1.0'
 	id 'java'
     id 'jacoco'
@@ -58,7 +58,7 @@ ext {
 	set('springCloudServicesVersion', '2.1.4.RELEASE')
 	set('springCloudVersion', 'Hoxton.M1')
     set('spring-cloud-services-connectors.version', '2.1.4.RELEASE')
-    set('spring-framework.version', '5.2.0.BUILD-SNAPSHOT')
+    set('spring-framework.version', '5.2.0.RC1')
 }
 
 dependencyManagement {
@@ -112,8 +112,8 @@ dependencies {
     implementation('io.pivotal.spring.cloud:spring-cloud-services-starter-config-client')
     implementation('io.pivotal.spring.cloud:spring-cloud-services-starter-service-registry')
     implementation('org.springframework.boot:spring-boot-starter-log4j2')
-    implementation('io.projectreactor:reactor-core:3.3.0.M1')
-    implementation('io.projectreactor.netty:reactor-netty:0.9.0.M2')
+    implementation('io.projectreactor:reactor-core:3.3.0.M3')
+    implementation('io.projectreactor.netty:reactor-netty:0.9.0.M3')
     implementation('io.micrometer:micrometer-registry-prometheus')
     testImplementation('io.projectreactor:reactor-test')
     testImplementation('org.junit.jupiter:junit-jupiter-api')

src/main/java/io/pivotal/cfapp/domain/AppDetail.java

@@ -30,6 +30,7 @@ public class AppDetail {
 	private String appId;
 	private String appName;
 	private String buildpack;
+	private String buildpackVersion;
 	private String image;
 	private String stack;
 	@Default
@@ -50,7 +51,7 @@ public class AppDetail {
 
 	public String toCsv() {
 		return String.join(",", wrap(getFoundation()), wrap(getOrganization()), wrap(getSpace()), wrap(getAppId()), wrap(getAppName()),
-				wrap(getBuildpack()), wrap(getImage()), wrap(getStack()), wrap(String.valueOf(getRunningInstances())),
+				wrap(getBuildpack()), wrap(getBuildpackVersion()), wrap(getImage()), wrap(getStack()), wrap(String.valueOf(getRunningInstances())),
 				wrap(String.valueOf(getTotalInstances())), wrap(Double.toString(toGigabytes(getMemoryUsage()))),
 				wrap(Double.toString(toGigabytes(getDiskUsage()))),
 				(wrap(String.join(",", getUrls() != null ? getUrls(): Collections.emptyList()))),
@@ -59,7 +60,7 @@ public String toCsv() {
 				wrap(getRequestedState()));
 	}
 
-	private String wrap(String value) {
+	private static String wrap(String value) {
 		return value != null ? StringUtils.wrap(value, '"') : StringUtils.wrap("", '"');
 	}
 
@@ -68,7 +69,7 @@ private Double toGigabytes(Long input) {
 	}
 
 	public static String headers() {
-		return String.join(",", "foundation", "organization", "space", "application id", "application name", "buildpack", "image",
+		return String.join(",", "foundation", "organization", "space", "application id", "application name", "buildpack", "buildpack version", "image",
 				"stack", "running instances", "total instances", "memory used (in gb)", "disk used (in gb)", "urls", "last pushed", "last event",
 				"last event actor", "last event time", "requested state");
 	}
@@ -82,6 +83,7 @@ public static AppDetailBuilder from(AppDetail detail) {
 						.appId(detail.getAppId())
 						.appName(detail.getAppName())
 						.buildpack(detail.getBuildpack())
+						.buildpackVersion(detail.getBuildpackVersion())
 						.image(detail.getImage())
 						.stack(detail.getStack())
 						.runningInstances(detail.getRunningInstances())

src/main/java/io/pivotal/cfapp/domain/AppRelationship.java

@@ -33,7 +33,7 @@ public String toCsv() {
 				wrap(getServiceInstanceId()), wrap(getServiceName()), wrap(getServicePlan()), wrap(getServiceType()));
 	}
 
-	private String wrap(String value) {
+	private static String wrap(String value) {
 		return value != null ? StringUtils.wrap(value, '"') : StringUtils.wrap("", '"');
 	}
 

src/main/java/io/pivotal/cfapp/domain/ServiceInstanceDetail.java

@@ -48,7 +48,7 @@ public String toCsv() {
 				wrap(getRequestedState()));
 	}
 
-	private String wrap(String value) {
+	private static String wrap(String value) {
 		return value != null ? StringUtils.wrap(value, '"') : StringUtils.wrap("", '"');
 	}