Merge branch '2.1.x'

Closes spring-projectsgh-16950
cherryEmpire · May 23, 2019 · 9f512ec · 9f512ec
2 parents 23f803c + 32e1d68
commit 9f512ec
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -51,7 +51,7 @@
 		<commons-lang3.version>3.9</commons-lang3.version>
 		<commons-pool.version>1.6</commons-pool.version>
 		<commons-pool2.version>2.6.2</commons-pool2.version>
-		<couchbase-client.version>2.7.4</couchbase-client.version>
+		<couchbase-client.version>2.7.6</couchbase-client.version>
 		<couchbase-cache-client.version>2.1.0</couchbase-cache-client.version>
 		<derby.version>10.14.2.0</derby.version>
 		<dropwizard-metrics.version>4.1.0</dropwizard-metrics.version>

diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase-reactive/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase-reactive/pom.xml
@@ -31,6 +31,10 @@
 					<groupId>com.couchbase.mock</groupId>
 					<artifactId>CouchbaseMock</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>com.couchbase.client</groupId>
+					<artifactId>encryption</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>

diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase/pom.xml
@@ -31,6 +31,10 @@
 					<groupId>com.couchbase.mock</groupId>
 					<artifactId>CouchbaseMock</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>com.couchbase.client</groupId>
+					<artifactId>encryption</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 	</dependencies>