Merge branch '2.1.x'

Closes gh-16950
This commit is contained in:
Andy Wilkinson 2019-05-23 10:23:45 +01:00
commit 9f512ec3d9
3 changed files with 9 additions and 1 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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>