Commit ccf9b1b9 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '2.1.x'

Closes gh-17854
parents 463f9493 7aea432e
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
<commons-pool2.version>2.7.0</commons-pool2.version> <commons-pool2.version>2.7.0</commons-pool2.version>
<couchbase-client.version>2.7.9</couchbase-client.version> <couchbase-client.version>2.7.9</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>
<dependency-management-plugin.version>1.0.8.RELEASE</dependency-management-plugin.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>
<ehcache.version>2.10.6</ehcache.version> <ehcache.version>2.10.6</ehcache.version>
...@@ -1158,6 +1159,11 @@ ...@@ -1158,6 +1159,11 @@
<artifactId>jest</artifactId> <artifactId>jest</artifactId>
<version>${jest.version}</version> <version>${jest.version}</version>
</dependency> </dependency>
<dependency>
<groupId>io.spring.gradle</groupId>
<artifactId>dependency-management-plugin</artifactId>
<version>${dependency-management-plugin.version}</version>
</dependency>
<dependency> <dependency>
<groupId>io.undertow</groupId> <groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId> <artifactId>undertow-core</artifactId>
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
<spock.version>1.0-groovy-2.4</spock.version> <spock.version>1.0-groovy-2.4</spock.version>
<testcontainers.version>1.10.6</testcontainers.version> <testcontainers.version>1.10.6</testcontainers.version>
<testng.version>6.14.3</testng.version> <testng.version>6.14.3</testng.version>
<dependency-management-plugin.version>1.0.8.RELEASE</dependency-management-plugin.version>
<spring-doc-resources.version>0.1.2.RELEASE</spring-doc-resources.version> <spring-doc-resources.version>0.1.2.RELEASE</spring-doc-resources.version>
</properties> </properties>
<scm> <scm>
...@@ -80,11 +79,6 @@ ...@@ -80,11 +79,6 @@
<artifactId>android-json</artifactId> <artifactId>android-json</artifactId>
<version>0.0.20131108.vaadin1</version> <version>0.0.20131108.vaadin1</version>
</dependency> </dependency>
<dependency>
<groupId>io.spring.gradle</groupId>
<artifactId>dependency-management-plugin</artifactId>
<version>${dependency-management-plugin.version}</version>
</dependency>
<dependency> <dependency>
<groupId>jline</groupId> <groupId>jline</groupId>
<artifactId>jline</artifactId> <artifactId>jline</artifactId>
......
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