Upgrade to cfenv 2.2.0.RELEASE

- Change all needed deps to property user cfenv 2.2.0
  with scs starters.
- Backport #3687

Author: jvalkeal

pom.xml

@@ -74,7 +74,9 @@
 		<!-- Only used for tests -->
 		<spring-security-oauth2.version>2.3.7.RELEASE</spring-security-oauth2.version>
 
-		<java-cfenv-boot.version>1.1.3.RELEASE</java-cfenv-boot.version>
+		<java-cfenv-boot.version>2.2.0.RELEASE</java-cfenv-boot.version>
+
+		<spring-cloud-services-starter-config-client.version>3.1.3.RELEASE</spring-cloud-services-starter-config-client.version>
 
 		<spring-cloud-common-security-config.version>1.3.1.RELEASE</spring-cloud-common-security-config.version>
 
@@ -181,19 +183,24 @@
 			</dependency>
 			<dependency>
 				<groupId>io.pivotal.cfenv</groupId>
-				<artifactId>java-cfenv-boot</artifactId>
+				<artifactId>java-cfenv</artifactId>
 				<version>${java-cfenv-boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>io.pivotal.cfenv</groupId>
-				<artifactId>java-cfenv-boot-pivotal-scs</artifactId>
+				<artifactId>java-cfenv-boot</artifactId>
 				<version>${java-cfenv-boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>io.pivotal.cfenv</groupId>
 				<artifactId>java-cfenv-boot-pivotal-sso</artifactId>
 				<version>${java-cfenv-boot.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>io.pivotal.spring.cloud</groupId>
+				<artifactId>spring-cloud-services-starter-config-client</artifactId>
+				<version>${spring-cloud-services-starter-config-client.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.shell</groupId>
 				<artifactId>spring-shell</artifactId>

spring-cloud-dataflow-platform-cloudfoundry/pom.xml

@@ -9,6 +9,11 @@
 	<artifactId>spring-cloud-dataflow-platform-cloudfoundry</artifactId>
 	<packaging>jar</packaging>
 	<dependencies>
+		<dependency>
+			<groupId>io.pivotal.cfenv</groupId>
+			<artifactId>java-cfenv</artifactId>
+			<version>2.0.0.RELEASE</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-dataflow-server-core</artifactId>
@@ -32,11 +37,12 @@
 		</dependency>
 		<dependency>
 			<groupId>io.pivotal.cfenv</groupId>
-			<artifactId>java-cfenv-boot-pivotal-scs</artifactId>
+			<artifactId>java-cfenv-boot-pivotal-sso</artifactId>
+			<version>${java-cfenv-boot.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>io.pivotal.cfenv</groupId>
-			<artifactId>java-cfenv-boot-pivotal-sso</artifactId>
+			<groupId>io.pivotal.spring.cloud</groupId>
+			<artifactId>spring-cloud-services-starter-config-client</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

spring-cloud-dataflow-platform-cloudfoundry/src/main/java/org/springframework/cloud/dataflow/server/config/cloudfoundry/security/support/CloudFoundrySecurityService.java

@@ -25,7 +25,6 @@
 import org.springframework.cloud.common.security.core.support.OAuth2TokenUtilsService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.RequestEntity;
-import org.springframework.security.oauth2.client.OAuth2RestTemplate;
 import org.springframework.util.Assert;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.HttpServerErrorException;
@@ -64,8 +63,8 @@ public CloudFoundrySecurityService(OAuth2TokenUtilsService oauth2TokenUtilsServi
 	}
 
 	/**
-	 * Returns {@code true} if the user (using the access-token from
-	 * {@link OAuth2RestTemplate}) has full {@link AccessLevel#FULL} for the provided
+	 * Returns {@code true} if the user (using the access-token from the authenticated user)
+	 * has full {@link AccessLevel#FULL} for the provided
 	 * {@code applicationId}
 	 *
 	 * @return true of the user is a space developer in Cloud Foundry