From 9712a5a983727a273d5a3b77ea39e583dc6a45ba Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Mon, 27 Apr 2020 12:43:20 -0400
Subject: [PATCH 1/3] formatting

---
 .../consul/config/ConsulPropertySourceLocatorRetryTests.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorRetryTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorRetryTests.java
index e4783f05..fcc8ad3f 100644
--- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorRetryTests.java
+++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorRetryTests.java
@@ -38,7 +38,7 @@ public class ConsulPropertySourceLocatorRetryTests {
 
 	@Test
 	public void testRetry() {
-		//Assert.assertThrows(TransportException.class, () -> {
+		// Assert.assertThrows(TransportException.class, () -> {
 		try {
 			new SpringApplicationBuilder(Config.class).properties(
 					"spring.application.name=testConsulPropertySourceLocatorRetry",
@@ -52,7 +52,7 @@ public class ConsulPropertySourceLocatorRetryTests {
 		catch (TransportException e) {
 			// success
 		}
-		//});
+		// });
 		assertThat(output).contains("RetryContext retrieved");
 	}
 

From 80248c8fad45317aa1a789b76f4fc50f7670bc29 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Mon, 27 Apr 2020 12:44:13 -0400
Subject: [PATCH 2/3] Depends on spring-cloud-starter rather than modules.

spring-cloud-starter depends on spring-boot-starter.

Fixes gh-635
---
 spring-cloud-starter-consul/pom.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml
index 1b202411..701d4889 100644
--- a/spring-cloud-starter-consul/pom.xml
+++ b/spring-cloud-starter-consul/pom.xml
@@ -23,11 +23,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-commons</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-context</artifactId>
+			<artifactId>spring-cloud-starter</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>

From 6665c72c2ffbeafab08af11b6791c0e4ce7f5879 Mon Sep 17 00:00:00 2001
From: maaaace <fuheming@huawei.com>
Date: Sun, 3 May 2020 19:22:09 +0800
Subject: [PATCH 3/3] fix(shellScript): download correct consul zip for arm64
 processor

ci_install_consul.sh just downloads the consul for amd64, which cannot be executed on arm64 architecture processors.
Add achitecture checking in this script to support downloading correct binary file.

Signed-off-by: maaaace <fuheming@huawei.com>
---
 src/main/bash/ci_install_consul.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/bash/ci_install_consul.sh b/src/main/bash/ci_install_consul.sh
index 9486345b..6d03bff9 100755
--- a/src/main/bash/ci_install_consul.sh
+++ b/src/main/bash/ci_install_consul.sh
@@ -1,7 +1,11 @@
 #!/bin/bash
 
 CONSUL_VER="1.7.2"
-CONSUL_ZIP="consul_${CONSUL_VER}_linux_amd64.zip"
+PLATFORM="amd64"
+if [ "$(uname -m)" == aarch64 ]; then
+  PLATFORM="arm64"
+fi
+CONSUL_ZIP="consul_${CONSUL_VER}_linux_${PLATFORM}.zip"
 IGNORE_CERTS="${IGNORE_CERTS:-no}"
 
 # cleanup