Commit 9f512ec3 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '2.1.x'

Closes gh-16950
parents 23f803c6 32e1d68d
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<commons-lang3.version>3.9</commons-lang3.version> <commons-lang3.version>3.9</commons-lang3.version>
<commons-pool.version>1.6</commons-pool.version> <commons-pool.version>1.6</commons-pool.version>
<commons-pool2.version>2.6.2</commons-pool2.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> <couchbase-cache-client.version>2.1.0</couchbase-cache-client.version>
<derby.version>10.14.2.0</derby.version> <derby.version>10.14.2.0</derby.version>
<dropwizard-metrics.version>4.1.0</dropwizard-metrics.version> <dropwizard-metrics.version>4.1.0</dropwizard-metrics.version>
......
...@@ -31,6 +31,10 @@ ...@@ -31,6 +31,10 @@
<groupId>com.couchbase.mock</groupId> <groupId>com.couchbase.mock</groupId>
<artifactId>CouchbaseMock</artifactId> <artifactId>CouchbaseMock</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>com.couchbase.client</groupId>
<artifactId>encryption</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -31,6 +31,10 @@ ...@@ -31,6 +31,10 @@
<groupId>com.couchbase.mock</groupId> <groupId>com.couchbase.mock</groupId>
<artifactId>CouchbaseMock</artifactId> <artifactId>CouchbaseMock</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>com.couchbase.client</groupId>
<artifactId>encryption</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment