Removed the cloudfoundry-ups-connector subproject

- Move OracleServiceInfoCreator to cloudfoundry-connector itself

settings.gradle

@@ -2,6 +2,5 @@ rootProject.name = "spring-cloud"
 
 include "${rootProject.name}-core"
 include "${rootProject.name}-cloudfoundry-connector"
-include "${rootProject.name}-cloudfoundry-ups-connector"
 include "${rootProject.name}-spring-service-connector"
 include "${rootProject.name}-heroku-connector"

spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/OracleServiceInfoCreator.java

@@ -2,8 +2,8 @@ package org.springframework.cloud.cloudfoundry;
 
 import org.springframework.cloud.service.common.OracleServiceInfo;
 
-public class UserProvidedOracleServiceInfoCreator extends RelationalServiceInfoCreator<OracleServiceInfo> {
-	public UserProvidedOracleServiceInfoCreator() {
+public class OracleServiceInfoCreator extends RelationalServiceInfoCreator<OracleServiceInfo> {
+	public OracleServiceInfoCreator() {
 		super(new Tags(), "oracle");
 	}
 

spring-cloud-cloudfoundry-connector/src/main/resources/META-INF/services/org.springframework.cloud.cloudfoundry.CloudFoundryServiceInfoCreator

@@ -5,3 +5,4 @@ org.springframework.cloud.cloudfoundry.MongoServiceInfoCreator
 org.springframework.cloud.cloudfoundry.AmqpServiceInfoCreator
 org.springframework.cloud.cloudfoundry.MonitoringServiceInfoCreator
 org.springframework.cloud.cloudfoundry.SmtpServiceInfoCreator
+org.springframework.cloud.cloudfoundry.OracleServiceInfoCreator

spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorOracleServiceTest.java

@@ -13,7 +13,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.mockito.Mockito.when;
 
-public class UserProvidedOracleServiceInfoCreatorTest extends AbstractUserProvidedServiceInfoCreatorTest {
+public class CloudFoundryConnectorOracleServiceTest extends AbstractUserProvidedServiceInfoCreatorTest {
 
 	private static final String INSTANCE_NAME = "database";
 	private static final String ORACLE_SCHEME = "oracle:";

spring-cloud-cloudfoundry-ups-connector/src/main/resources/META-INF/services/org.springframework.cloud.cloudfoundry.CloudFoundryServiceInfoCreator

@@ -1 +0,0 @@
-org.springframework.cloud.cloudfoundry.UserProvidedOracleServiceInfoCreator