Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-07-25 12:02:11 +02:00
commit e26f743e82
2 changed files with 2 additions and 10 deletions

View File

@ -94,6 +94,8 @@ NOTE: If you want to use the client/server mode or if you need more options, Inf
provides an official Spring Boot starter, check
https://github.com/infinispan/infinispan-spring-boot[the documentation] for more details.
=== Couchbase
Add the `java-client` and `couchbase-spring-cache` dependencies and make sure that
you have setup at least a `spring.couchbase.bootstrap-hosts` property.

View File

@ -133,15 +133,5 @@
</dependency>
</dependencies>
</profile>
<profile>
<id>guava</id>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
</dependency>
</dependencies>
</profile>
</profiles>
</project>