diff --git a/build.gradle b/build.gradle
index e170202..290b636 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,11 +56,11 @@ dependencies {
 	compile("org.springframework.boot:spring-boot-starter")
 	testCompile("org.springframework.boot:spring-boot-starter-test")
 	testCompile("org.springframework.boot:spring-boot-starter-test:${springBootVersion}")
-	compile("org.apache.brooklyn:brooklyn-rest-client:0.9.0"){
+	compile("org.apache.brooklyn:brooklyn-rest-client:0.10.0"){
 		exclude module: "slf4j-log4j12"
 		exclude module: "jetty-server"
 	}
-    compile("org.apache.brooklyn:brooklyn-core:0.9.0"){
+    compile("org.apache.brooklyn:brooklyn-core:0.10.0"){
         exclude module: "slf4j-log4j12"
         exclude module: "jetty-server"
     }
diff --git a/src/main/java/org/cloudfoundry/community/servicebroker/brooklyn/service/BrooklynRestAdmin.java b/src/main/java/org/cloudfoundry/community/servicebroker/brooklyn/service/BrooklynRestAdmin.java
index cc89ff4..7812d36 100644
--- a/src/main/java/org/cloudfoundry/community/servicebroker/brooklyn/service/BrooklynRestAdmin.java
+++ b/src/main/java/org/cloudfoundry/community/servicebroker/brooklyn/service/BrooklynRestAdmin.java
@@ -39,9 +39,9 @@
 import org.springframework.scheduling.annotation.AsyncResult;
 import org.springframework.stereotype.Service;
 
-import com.google.api.client.util.Maps;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Maps;
 import com.google.common.io.BaseEncoding;
 
 @Service
diff --git a/src/main/java/org/cloudfoundry/community/servicebroker/brooklyn/service/plan/AbstractCatalogPlanStrategy.java b/src/main/java/org/cloudfoundry/community/servicebroker/brooklyn/service/plan/AbstractCatalogPlanStrategy.java
index 2cb28dc..f758c94 100644
--- a/src/main/java/org/cloudfoundry/community/servicebroker/brooklyn/service/plan/AbstractCatalogPlanStrategy.java
+++ b/src/main/java/org/cloudfoundry/community/servicebroker/brooklyn/service/plan/AbstractCatalogPlanStrategy.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -20,18 +19,16 @@
 import org.cloudfoundry.community.servicebroker.brooklyn.model.UserDefinedBlueprintPlan;
 import org.cloudfoundry.community.servicebroker.brooklyn.service.BrooklynRestAdmin;
 import org.cloudfoundry.community.servicebroker.brooklyn.service.ServiceUtil;
-import org.springframework.cloud.servicebroker.model.DashboardClient;
-import org.springframework.cloud.servicebroker.model.Plan;
-import org.springframework.cloud.servicebroker.model.ServiceDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.servicebroker.model.Plan;
+import org.springframework.cloud.servicebroker.model.ServiceDefinition;
 
-import com.google.api.client.util.Maps;
-import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
 public abstract class AbstractCatalogPlanStrategy implements CatalogPlanStrategy {
diff --git a/src/test/java/org/cloudfoundry/community/servicebroker/brooklyn/service/BrooklynRestAdminTest.java b/src/test/java/org/cloudfoundry/community/servicebroker/brooklyn/service/BrooklynRestAdminTest.java
index 153fbdc..100a511 100644
--- a/src/test/java/org/cloudfoundry/community/servicebroker/brooklyn/service/BrooklynRestAdminTest.java
+++ b/src/test/java/org/cloudfoundry/community/servicebroker/brooklyn/service/BrooklynRestAdminTest.java
@@ -21,9 +21,9 @@
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 
-import com.google.api.client.util.Maps;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
 
 public class BrooklynRestAdminTest {
 
diff --git a/src/test/java/org/cloudfoundry/community/servicebroker/brooklyn/service/BrooklynServiceInstanceBindingServiceTest.java b/src/test/java/org/cloudfoundry/community/servicebroker/brooklyn/service/BrooklynServiceInstanceBindingServiceTest.java
index 6238b19..fa08280 100644
--- a/src/test/java/org/cloudfoundry/community/servicebroker/brooklyn/service/BrooklynServiceInstanceBindingServiceTest.java
+++ b/src/test/java/org/cloudfoundry/community/servicebroker/brooklyn/service/BrooklynServiceInstanceBindingServiceTest.java
@@ -51,11 +51,11 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.google.api.client.util.Maps;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = {BrooklynConfiguration.class})