mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.1.x'
Closes gh-16950
This commit is contained in:
commit
9f512ec3d9
@ -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 @@
|
|||||||
<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 @@
|
|||||||
<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>
|
||||||
|
Loading…
Reference in New Issue
Block a user