Merge branch 'master' into 2.0.x

This commit is contained in:
Spencer Gibb
2017-11-28 00:10:38 -05:00
22 changed files with 303 additions and 68 deletions

View File

@@ -17,19 +17,11 @@
</parent>
<properties>
<spring-cloud-dataflow.version>1.1.4.RELEASE</spring-cloud-dataflow.version>
<spring-boot.version>1.4.4.RELEASE</spring-boot.version>
<spring-cloud-dataflow.version>1.2.3.RELEASE</spring-cloud-dataflow.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-dependencies</artifactId>