root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-01-25 14:55:39 +00:00
parent b6064fff46 37cf31f450
commit 05831e4b87
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
spring-boot-dependencies/pom.xml
View File

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