Merge branch '1.5.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java

@@ -32,6 +32,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.Primary;
 
 /**
@@ -72,6 +73,7 @@ public class CouchbaseAutoConfiguration {
 
 		@Bean
 		@Primary
+		@DependsOn("couchbaseClient")
 		public ClusterInfo couchbaseClusterInfo() throws Exception {
 			return couchbaseCluster()
 					.clusterManager(this.properties.getBucket().getName(),

spring-boot-dependencies/pom.xml

@@ -65,7 +65,7 @@
 		<commons-digester.version>2.1</commons-digester.version>
 		<commons-pool.version>1.6</commons-pool.version>
 		<commons-pool2.version>2.4.2</commons-pool2.version>
-		<couchbase-client.version>2.3.6</couchbase-client.version>
+		<couchbase-client.version>2.3.7</couchbase-client.version>
 		<couchbase-cache-client.version>2.1.0</couchbase-cache-client.version>
 		<derby.version>10.13.1.1</derby.version>
 		<dom4j.version>1.6.1</dom4j.version>