Resolved Cherry Pick conflicts

Refactored

Refactored based on conversations with wider team

Updates per code review
This commit is contained in:
Michael Minella
2016-08-29 10:04:10 -05:00
committed by Glenn Renfro
parent 86234c22f2
commit 5d08953b79
11 changed files with 87 additions and 80 deletions

View File

@@ -13,6 +13,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.3.5.RELEASE</version>
<relativePath/>
</parent>
<properties>
@@ -46,11 +47,13 @@
<dependency>
<groupId>org.springframework.batch</groupId>
<artifactId>spring-batch-integration</artifactId>
<version>3.0.7.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-deployer-local</artifactId>
<version>1.0.2.RELEASE</version>
</dependency>
<dependency>
@@ -97,6 +100,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>