From 7a50c6f033c7c0880c8e60ab7e67f7ec26961ba8 Mon Sep 17 00:00:00 2001
From: Strong Liu <stliu@hibernate.org>
Date: Mon, 20 Apr 2015 01:49:06 +0800
Subject: [PATCH 1/3] compilable with other dependencies, 1.0.1.BUILD-SNAPSHOT

---
 pom.xml                                       | 22 +++++++------
 .../ZookeeperPropertySourceLocator.java       |  3 +-
 .../discovery/ZookeeperDiscoveryClient.java   | 32 +++++++++----------
 3 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6e5ef6f4..63a8e3cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<version>1.0.1.BUILD-SNAPSHOT</version>
 		<relativePath/>
 		<!-- lookup parent from repository -->
 	</parent>
@@ -57,32 +57,32 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-zookeeper-core</artifactId>
-				<version>1.0.0.BUILD-SNAPSHOT</version>
+				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-zookeeper-bus</artifactId>
-				<version>1.0.0.BUILD-SNAPSHOT</version>
+				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-zookeeper-config</artifactId>
-				<version>1.0.0.BUILD-SNAPSHOT</version>
+				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-zookeeper-discovery</artifactId>
-				<version>1.0.0.BUILD-SNAPSHOT</version>
+				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-commons</artifactId>
-				<version>1.0.0.BUILD-SNAPSHOT</version>
+				<version>${spring.cloud.commons}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-bus</artifactId>
-				<version>1.0.0.BUILD-SNAPSHOT</version>
+				<version>${spring.cloud.bus}</version>
 				<exclusions>
 					<exclusion>
 						<groupId>org.springframework.boot</groupId>
@@ -112,12 +112,12 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-config-client</artifactId>
-				<version>1.0.0.BUILD-SNAPSHOT</version>
+				<version>${spring.cloud.config.client}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-netflix-core</artifactId>
-				<version>1.0.0.BUILD-SNAPSHOT</version>
+				<version>${spring.cloud.netflix.core}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.curator</groupId>
@@ -165,6 +165,10 @@
 	</dependencyManagement>
 
 	<properties>
+		<spring.cloud.commons>1.0.1.BUILD-SNAPSHOT</spring.cloud.commons>
+		<spring.cloud.bus>1.0.1.BUILD-SNAPSHOT</spring.cloud.bus>
+		<spring.cloud.config.client>1.0.1.BUILD-SNAPSHOT</spring.cloud.config.client>
+		<spring.cloud.netflix.core>1.0.1.BUILD-SNAPSHOT</spring.cloud.netflix.core>
 		<curator.version>2.7.0</curator.version>
 		<ribbon.version>2.0-RC9</ribbon.version>
 	</properties>
diff --git a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocator.java b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocator.java
index 948d6656..3acc04e0 100644
--- a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocator.java
+++ b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocator.java
@@ -8,7 +8,8 @@ import javax.annotation.PreDestroy;
 
 import org.apache.curator.framework.CuratorFramework;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.config.client.PropertySourceLocator;
+// import org.springframework.cloud.config.client.PropertySourceLocator;
+import org.springframework.cloud.bootstrap.config.PropertySourceLocator;
 import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClient.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClient.java
index 67d1dcd7..e03ed7bc 100644
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClient.java
+++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClient.java
@@ -41,7 +41,7 @@ public class ZookeeperDiscoveryClient implements DiscoveryClient {
 					+ context.getId());
 		}
 		return new DefaultServiceInstance(instance.getId(), instance.getAddress(),
-				instance.getPort());
+				instance.getPort(), instance.getSslPort()!=null);
 	}
 
 	@Override
@@ -55,26 +55,26 @@ public class ZookeeperDiscoveryClient implements DiscoveryClient {
 
 		for (ServiceInstance<ZookeeperInstance> instance : zkInstances) {
 			instances.add(new DefaultServiceInstance(serviceId, instance.getAddress(),
-					instance.getPort()));
+					instance.getPort(), instance.getSslPort()!=null));
 		}
 
 		return instances;
 	}
 
-	@Override
-	@SneakyThrows
-	public List<org.springframework.cloud.client.ServiceInstance> getAllInstances() {
-		List<org.springframework.cloud.client.ServiceInstance> instances = new ArrayList<>();
-
-		for (String name : discovery.queryForNames()) {
-			for (ServiceInstance<ZookeeperInstance> instance: discovery.queryForInstances(name)) {
-				instances.add(new DefaultServiceInstance(instance.getName(), instance
-						.getAddress(), instance.getPort()));
-			}
-		}
-
-		return instances;
-	}
+//	@Override
+//	@SneakyThrows
+//	public List<org.springframework.cloud.client.ServiceInstance> getAllInstances() {
+//		List<org.springframework.cloud.client.ServiceInstance> instances = new ArrayList<>();
+//
+//		for (String name : discovery.queryForNames()) {
+//			for (ServiceInstance<ZookeeperInstance> instance: discovery.queryForInstances(name)) {
+//				instances.add(new DefaultServiceInstance(instance.getName(), instance
+//						.getAddress(), instance.getPort(), instance.getSslPort()!=null));
+//			}
+//		}
+//
+//		return instances;
+//	}
 
 	@Override
 	public List<String> getServices() {

From 0dbd47a9abf5fd2e966149b55d30f58d83ac577c Mon Sep 17 00:00:00 2001
From: Strong Liu <stliu@hibernate.org>
Date: Tue, 21 Apr 2015 00:03:58 +0800
Subject: [PATCH 2/3] delete one line of code which was commented out :)

---
 .../cloud/zookeeper/config/ZookeeperPropertySourceLocator.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocator.java b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocator.java
index 3acc04e0..13f9f1ab 100644
--- a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocator.java
+++ b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocator.java
@@ -8,7 +8,6 @@ import javax.annotation.PreDestroy;
 
 import org.apache.curator.framework.CuratorFramework;
 import org.springframework.beans.factory.annotation.Autowired;
-// import org.springframework.cloud.config.client.PropertySourceLocator;
 import org.springframework.cloud.bootstrap.config.PropertySourceLocator;
 import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.ConfigurableEnvironment;

From ef0227f600afe8cca1b36e6ed3479481a431522a Mon Sep 17 00:00:00 2001
From: Strong Liu <stliu@hibernate.org>
Date: Tue, 21 Apr 2015 00:06:09 +0800
Subject: [PATCH 3/3] delete one line of code which was commented out :)

---
 .../discovery/ZookeeperDiscoveryClient.java        | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClient.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClient.java
index e03ed7bc..5210265b 100644
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClient.java
+++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClient.java
@@ -61,20 +61,6 @@ public class ZookeeperDiscoveryClient implements DiscoveryClient {
 		return instances;
 	}
 
-//	@Override
-//	@SneakyThrows
-//	public List<org.springframework.cloud.client.ServiceInstance> getAllInstances() {
-//		List<org.springframework.cloud.client.ServiceInstance> instances = new ArrayList<>();
-//
-//		for (String name : discovery.queryForNames()) {
-//			for (ServiceInstance<ZookeeperInstance> instance: discovery.queryForInstances(name)) {
-//				instances.add(new DefaultServiceInstance(instance.getName(), instance
-//						.getAddress(), instance.getPort(), instance.getSslPort()!=null));
-//			}
-//		}
-//
-//		return instances;
-//	}
 
 	@Override
 	public List<String> getServices() {