From 47cb05c7aa0e6fa7c303a22f77397a5d344676fc Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@pivotal.io>
Date: Mon, 2 Oct 2017 14:37:27 -0400
Subject: [PATCH 1/4] Update SNAPSHOT to 1.3.3.RELEASE

---
 docs/pom.xml                             | 2 +-
 pom.xml                                  | 6 +++---
 spring-cloud-config-client/pom.xml       | 2 +-
 spring-cloud-config-dependencies/pom.xml | 4 ++--
 spring-cloud-config-monitor/pom.xml      | 4 ++--
 spring-cloud-config-sample/pom.xml       | 2 +-
 spring-cloud-config-server/pom.xml       | 2 +-
 spring-cloud-starter-config/pom.xml      | 4 ++--
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index 17115503..db8a0f66 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.3.3.BUILD-SNAPSHOT</version>
+		<version>1.3.3.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index 4f408bc9..9c0787c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-config</artifactId>
-	<version>1.3.3.BUILD-SNAPSHOT</version>
+	<version>1.3.3.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Config</name>
 	<description>Spring Cloud Config</description>
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>1.3.5.BUILD-SNAPSHOT</version>
+		<version>1.3.5.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<scm>
@@ -22,7 +22,7 @@
 	</scm>
     <properties>
         <bintray.package>config</bintray.package>
-		<spring-cloud-commons.version>1.2.1.BUILD-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-commons.version>1.2.4.RELEASE</spring-cloud-commons.version>
     </properties>
 	<modules>
 	  <module>spring-cloud-config-dependencies</module>
diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml
index 4fb76004..11e660d0 100644
--- a/spring-cloud-config-client/pom.xml
+++ b/spring-cloud-config-client/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.3.3.BUILD-SNAPSHOT</version>
+		<version>1.3.3.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml
index c8de615e..dbb6e877 100644
--- a/spring-cloud-config-dependencies/pom.xml
+++ b/spring-cloud-config-dependencies/pom.xml
@@ -5,11 +5,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>1.3.2.RELEASE</version>
+		<version>1.3.5.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-config-dependencies</artifactId>
-	<version>1.3.3.BUILD-SNAPSHOT</version>
+	<version>1.3.3.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-config-dependencies</name>
 	<description>Spring Cloud Config Dependencies</description>
diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml
index 33635942..294218b6 100644
--- a/spring-cloud-config-monitor/pom.xml
+++ b/spring-cloud-config-monitor/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.3.3.BUILD-SNAPSHOT</version>
+		<version>1.3.3.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-config-monitor</artifactId>
@@ -13,7 +13,7 @@
 	<description>Spring Cloud Config Monitor</description>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
-		<spring-cloud-bus.version>1.3.1.BUILD-SNAPSHOT</spring-cloud-bus.version>
+		<spring-cloud-bus.version>1.3.1.RELEASE</spring-cloud-bus.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml
index 871e07a3..21cd57db 100644
--- a/spring-cloud-config-sample/pom.xml
+++ b/spring-cloud-config-sample/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.3.3.BUILD-SNAPSHOT</version>
+		<version>1.3.3.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml
index b9e1d68c..ff7cf454 100644
--- a/spring-cloud-config-server/pom.xml
+++ b/spring-cloud-config-server/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.3.3.BUILD-SNAPSHOT</version>
+		<version>1.3.3.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml
index a7da2753..03221215 100644
--- a/spring-cloud-starter-config/pom.xml
+++ b/spring-cloud-starter-config/pom.xml
@@ -5,10 +5,10 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.3.3.BUILD-SNAPSHOT</version>
+		<version>1.3.3.RELEASE</version>
 	</parent>
 	<artifactId>spring-cloud-starter-config</artifactId>
-	<version>1.3.3.BUILD-SNAPSHOT</version>
+	<version>1.3.3.RELEASE</version>
 	<name>spring-cloud-starter-config</name>
 	<description>Spring Cloud Starter</description>
 	<url>https://projects.spring.io/spring-cloud</url>

From fbeea130eb9e4f9d85ffd648a86cbeadf34b80cf Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@pivotal.io>
Date: Mon, 2 Oct 2017 14:39:40 -0400
Subject: [PATCH 2/4] Going back to snapshots

---
 docs/pom.xml                             | 2 +-
 pom.xml                                  | 6 +++---
 spring-cloud-config-client/pom.xml       | 2 +-
 spring-cloud-config-dependencies/pom.xml | 4 ++--
 spring-cloud-config-monitor/pom.xml      | 4 ++--
 spring-cloud-config-sample/pom.xml       | 2 +-
 spring-cloud-config-server/pom.xml       | 2 +-
 spring-cloud-starter-config/pom.xml      | 4 ++--
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index db8a0f66..17115503 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.3.3.RELEASE</version>
+		<version>1.3.3.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index 9c0787c8..4f408bc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-config</artifactId>
-	<version>1.3.3.RELEASE</version>
+	<version>1.3.3.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Config</name>
 	<description>Spring Cloud Config</description>
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>1.3.5.RELEASE</version>
+		<version>1.3.5.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<scm>
@@ -22,7 +22,7 @@
 	</scm>
     <properties>
         <bintray.package>config</bintray.package>
-		<spring-cloud-commons.version>1.2.4.RELEASE</spring-cloud-commons.version>
+		<spring-cloud-commons.version>1.2.1.BUILD-SNAPSHOT</spring-cloud-commons.version>
     </properties>
 	<modules>
 	  <module>spring-cloud-config-dependencies</module>
diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml
index 11e660d0..4fb76004 100644
--- a/spring-cloud-config-client/pom.xml
+++ b/spring-cloud-config-client/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.3.3.RELEASE</version>
+		<version>1.3.3.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml
index dbb6e877..c8de615e 100644
--- a/spring-cloud-config-dependencies/pom.xml
+++ b/spring-cloud-config-dependencies/pom.xml
@@ -5,11 +5,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>1.3.5.RELEASE</version>
+		<version>1.3.2.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-config-dependencies</artifactId>
-	<version>1.3.3.RELEASE</version>
+	<version>1.3.3.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-config-dependencies</name>
 	<description>Spring Cloud Config Dependencies</description>
diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml
index 294218b6..33635942 100644
--- a/spring-cloud-config-monitor/pom.xml
+++ b/spring-cloud-config-monitor/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.3.3.RELEASE</version>
+		<version>1.3.3.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-config-monitor</artifactId>
@@ -13,7 +13,7 @@
 	<description>Spring Cloud Config Monitor</description>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
-		<spring-cloud-bus.version>1.3.1.RELEASE</spring-cloud-bus.version>
+		<spring-cloud-bus.version>1.3.1.BUILD-SNAPSHOT</spring-cloud-bus.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml
index 21cd57db..871e07a3 100644
--- a/spring-cloud-config-sample/pom.xml
+++ b/spring-cloud-config-sample/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.3.3.RELEASE</version>
+		<version>1.3.3.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml
index ff7cf454..b9e1d68c 100644
--- a/spring-cloud-config-server/pom.xml
+++ b/spring-cloud-config-server/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.3.3.RELEASE</version>
+		<version>1.3.3.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml
index 03221215..a7da2753 100644
--- a/spring-cloud-starter-config/pom.xml
+++ b/spring-cloud-starter-config/pom.xml
@@ -5,10 +5,10 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.3.3.RELEASE</version>
+		<version>1.3.3.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-starter-config</artifactId>
-	<version>1.3.3.RELEASE</version>
+	<version>1.3.3.BUILD-SNAPSHOT</version>
 	<name>spring-cloud-starter-config</name>
 	<description>Spring Cloud Starter</description>
 	<url>https://projects.spring.io/spring-cloud</url>

From 8b2bf46f92f48075d915560534f2ddda420ff775 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@pivotal.io>
Date: Mon, 2 Oct 2017 14:39:40 -0400
Subject: [PATCH 3/4] Bumping versions to 1.3.4.BUILD-SNAPSHOT after release

---
 docs/pom.xml                             | 2 +-
 pom.xml                                  | 2 +-
 spring-cloud-config-client/pom.xml       | 2 +-
 spring-cloud-config-dependencies/pom.xml | 2 +-
 spring-cloud-config-monitor/pom.xml      | 2 +-
 spring-cloud-config-sample/pom.xml       | 2 +-
 spring-cloud-config-server/pom.xml       | 2 +-
 spring-cloud-starter-config/pom.xml      | 4 ++--
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index 17115503..436ed771 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.3.3.BUILD-SNAPSHOT</version>
+		<version>1.3.4.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index 4f408bc9..d04c6a3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-config</artifactId>
-	<version>1.3.3.BUILD-SNAPSHOT</version>
+	<version>1.3.4.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Config</name>
 	<description>Spring Cloud Config</description>
diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml
index 4fb76004..30eebcc1 100644
--- a/spring-cloud-config-client/pom.xml
+++ b/spring-cloud-config-client/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.3.3.BUILD-SNAPSHOT</version>
+		<version>1.3.4.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml
index c8de615e..4aeb2b3b 100644
--- a/spring-cloud-config-dependencies/pom.xml
+++ b/spring-cloud-config-dependencies/pom.xml
@@ -9,7 +9,7 @@
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-config-dependencies</artifactId>
-	<version>1.3.3.BUILD-SNAPSHOT</version>
+	<version>1.3.4.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-config-dependencies</name>
 	<description>Spring Cloud Config Dependencies</description>
diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml
index 33635942..344e065f 100644
--- a/spring-cloud-config-monitor/pom.xml
+++ b/spring-cloud-config-monitor/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.3.3.BUILD-SNAPSHOT</version>
+		<version>1.3.4.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-config-monitor</artifactId>
diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml
index 871e07a3..8bc7b913 100644
--- a/spring-cloud-config-sample/pom.xml
+++ b/spring-cloud-config-sample/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.3.3.BUILD-SNAPSHOT</version>
+		<version>1.3.4.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml
index b9e1d68c..a241a3f2 100644
--- a/spring-cloud-config-server/pom.xml
+++ b/spring-cloud-config-server/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.3.3.BUILD-SNAPSHOT</version>
+		<version>1.3.4.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml
index a7da2753..fc1fee80 100644
--- a/spring-cloud-starter-config/pom.xml
+++ b/spring-cloud-starter-config/pom.xml
@@ -5,10 +5,10 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.3.3.BUILD-SNAPSHOT</version>
+		<version>1.3.4.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-starter-config</artifactId>
-	<version>1.3.3.BUILD-SNAPSHOT</version>
+	<version>1.3.4.BUILD-SNAPSHOT</version>
 	<name>spring-cloud-starter-config</name>
 	<description>Spring Cloud Starter</description>
 	<url>https://projects.spring.io/spring-cloud</url>

From 4f6dcd0de82b6c616dc1a01cd2a4abe5d8f3c0ff Mon Sep 17 00:00:00 2001
From: Tommy Ludwig <shakuzen@users.noreply.github.com>
Date: Sat, 21 Oct 2017 05:20:15 +0900
Subject: [PATCH 4/4] Include TransportConfiguration for server bootstrap case
 (#812)

Previously, taking SSH configuration from properties (as opposed to the default SSH configuration files) was only possible when not bootstrapping the Config Server itself. This includes the `TransportationConfiguration` for the bootstrap case as well.

Related to gh-741
---
 .../server/bootstrap/ConfigServerBootstrapConfiguration.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/bootstrap/ConfigServerBootstrapConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/bootstrap/ConfigServerBootstrapConfiguration.java
index dc8b611a..388144c0 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/bootstrap/ConfigServerBootstrapConfiguration.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/bootstrap/ConfigServerBootstrapConfiguration.java
@@ -21,6 +21,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.cloud.config.client.ConfigClientProperties;
 import org.springframework.cloud.config.server.config.ConfigServerProperties;
 import org.springframework.cloud.config.server.config.EnvironmentRepositoryConfiguration;
+import org.springframework.cloud.config.server.config.TransportConfiguration;
 import org.springframework.cloud.config.server.environment.EnvironmentRepository;
 import org.springframework.cloud.config.server.environment.EnvironmentRepositoryPropertySourceLocator;
 import org.springframework.context.annotation.Bean;
@@ -44,7 +45,7 @@ import org.springframework.util.StringUtils;
 public class ConfigServerBootstrapConfiguration {
 
 	@EnableConfigurationProperties(ConfigServerProperties.class)
-	@Import(EnvironmentRepositoryConfiguration.class)
+	@Import({ EnvironmentRepositoryConfiguration.class, TransportConfiguration.class })
 	protected static class LocalPropertySourceLocatorConfiguration {
 
 		@Autowired