From 20233cfd19d7f6ab6816c05b41268b8e4138ddd5 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Fri, 24 Feb 2017 12:17:03 +0000
Subject: [PATCH] Fix dependencies carefully

---
 .mvn/wrapper/maven-wrapper.properties           |  3 ++-
 pom.xml                                         |  7 -------
 spring-cloud-cli/pom.xml                        | 11 +++++++++++
 spring-cloud-launcher/pom.xml                   |  4 ++--
 .../spring-cloud-launcher-deployer/pom.xml      | 17 +++++++++++------
 .../launcher/deployer/DeployerApplication.java  |  5 +++--
 6 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 6637ced..7f3c08a 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1,2 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
\ No newline at end of file
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
+#distributionUrl=https://repository.apache.org/content/repositories/snapshots/org/apache/maven/apache-maven/3.4.0-SNAPSHOT/apache-maven-3.4.0-20170103.171401-322-bin.zip
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e86d40e..7e463f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,13 +94,6 @@
 	</profiles>
 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-parent</artifactId>
-				<version>${spring-boot.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>
diff --git a/spring-cloud-cli/pom.xml b/spring-cloud-cli/pom.xml
index cfaf141..6559252 100644
--- a/spring-cloud-cli/pom.xml
+++ b/spring-cloud-cli/pom.xml
@@ -54,5 +54,16 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-parent</artifactId>
+				<version>${spring-boot.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 
 </project>
diff --git a/spring-cloud-launcher/pom.xml b/spring-cloud-launcher/pom.xml
index 236b32c..ea0bfe6 100644
--- a/spring-cloud-launcher/pom.xml
+++ b/spring-cloud-launcher/pom.xml
@@ -18,7 +18,7 @@
 	</parent>
 
 	<properties>
-		<thin-jar.version>0.0.1.BUILD-SNAPSHOT</thin-jar.version>
+		<thin-jar.version>1.0.0.BUILD-SNAPSHOT</thin-jar.version>
 	</properties>
 
 	<modules>
@@ -51,7 +51,7 @@
 					<dependencies>
 						<dependency>
 							<groupId>org.springframework.boot.experimental</groupId>
-							<artifactId>spring-boot-thin-launcher</artifactId>
+							<artifactId>spring-boot-thin-layout</artifactId>
 							<version>${thin-jar.version}</version>
 						</dependency>
 					</dependencies>
diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml
index fd0d004..b8ebbcd 100644
--- a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml
+++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml
@@ -18,7 +18,7 @@
 
 	<properties>
 		<spring-cloud-deployer.version>1.1.1.RELEASE</spring-cloud-deployer.version>
-		<spring-cloud-deployer-thin.version>0.0.1.BUILD-SNAPSHOT</spring-cloud-deployer-thin.version>
+		<spring-cloud-deployer-thin.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-deployer-thin.version>
 	</properties>
 
 	<dependencyManagement>
@@ -38,22 +38,27 @@
 				<artifactId>spring-cloud-deployer-resource-support</artifactId>
 				<version>${spring-cloud-deployer.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.maven</groupId>
+				<artifactId>maven-aether-provider</artifactId>
+				<version>3.3.9</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-validation</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-deployer-local</artifactId>
+			<artifactId>spring-cloud-deployer-thin</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-deployer-resource-support</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-validation</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerApplication.java b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerApplication.java
index 715c3fb..fa13b75 100644
--- a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerApplication.java
+++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerApplication.java
@@ -25,7 +25,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.springframework.boot.Banner.Mode;
-import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.logging.LogLevel;
 import org.springframework.boot.logging.logback.LogbackLoggingSystem;
@@ -102,7 +102,8 @@ public class DeployerApplication {
 
 	private String getVersion() {
 		Package pkg = DeployerApplication.class.getPackage();
-		return (pkg != null ? pkg.getImplementationVersion() : DEFAULT_VERSION);
+		return (pkg != null ? pkg.getImplementationVersion() == null ? DEFAULT_VERSION
+				: pkg.getImplementationVersion() : DEFAULT_VERSION);
 	}
 
 	private void launch() {