diff --git a/pom.xml b/pom.xml
index 9a33e095..32b23de4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,13 +23,13 @@
org.springframework.cloud
spring-cloud-build
- 2.0.1.RELEASE
+ 2.1.0.BUILD-SNAPSHOT
org.springframework.cloud
spring-cloud-kubernetes
- 0.3.0.RELEASE
+ 1.0.0.BUILD-SNAPSHOT
pom
Spring Cloud Kubernetes
@@ -59,8 +59,8 @@
- 2.0.1.RELEASE
- 2.0.1.RELEASE
+ 2.1.0.BUILD-SNAPSHOT
+ 2.1.0.BUILD-SNAPSHOT
3.5
diff --git a/spring-cloud-kubernetes-config/pom.xml b/spring-cloud-kubernetes-config/pom.xml
index a6b4dcea..90c71eb5 100644
--- a/spring-cloud-kubernetes-config/pom.xml
+++ b/spring-cloud-kubernetes-config/pom.xml
@@ -5,7 +5,7 @@
spring-cloud-kubernetes
org.springframework.cloud
- 0.3.0.RELEASE
+ 1.0.0.BUILD-SNAPSHOT
4.0.0
diff --git a/spring-cloud-kubernetes-core/pom.xml b/spring-cloud-kubernetes-core/pom.xml
index efbb04c3..1aa6b971 100644
--- a/spring-cloud-kubernetes-core/pom.xml
+++ b/spring-cloud-kubernetes-core/pom.xml
@@ -21,7 +21,7 @@
org.springframework.cloud
spring-cloud-kubernetes
- 0.3.0.RELEASE
+ 1.0.0.BUILD-SNAPSHOT
4.0.0
diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
index 039ce570..d67561ab 100644
--- a/spring-cloud-kubernetes-dependencies/pom.xml
+++ b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -5,11 +5,11 @@
spring-cloud-dependencies-parent
org.springframework.cloud
- 2.0.1.RELEASE
+ 2.1.0.BUILD-SNAPSHOT
spring-cloud-kubernetes-dependencies
- 0.3.0.RELEASE
+ 1.0.0.BUILD-SNAPSHOT
pom
Spring Cloud Kubernetes :: Dependencies
Spring Cloud Kubernetes Dependencies
diff --git a/spring-cloud-kubernetes-discovery/pom.xml b/spring-cloud-kubernetes-discovery/pom.xml
index 377a10ee..29d52fc6 100644
--- a/spring-cloud-kubernetes-discovery/pom.xml
+++ b/spring-cloud-kubernetes-discovery/pom.xml
@@ -21,7 +21,7 @@
org.springframework.cloud
spring-cloud-kubernetes
- 0.3.0.RELEASE
+ 1.0.0.BUILD-SNAPSHOT
4.0.0
diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogServicesWatchConfigurationTest.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogServicesWatchConfigurationTest.java
index 29d3f211..9bc5a5c2 100644
--- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogServicesWatchConfigurationTest.java
+++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogServicesWatchConfigurationTest.java
@@ -2,21 +2,13 @@ package org.springframework.cloud.kubernetes.discovery;
import io.fabric8.kubernetes.client.KubernetesClient;
import org.junit.After;
-import org.junit.Ignore;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.test.context.ConfigFileApplicationContextInitializer;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.junit4.SpringRunner;
import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
@@ -51,7 +43,7 @@ public class KubernetesCatalogServicesWatchConfigurationTest {
this.context = new SpringApplicationBuilder(
PropertyPlaceholderAutoConfiguration.class,
KubernetesClientTestConfiguration.class,
- KubernetesDiscoveryClientAutoConfiguration.class).web(false)
+ KubernetesDiscoveryClientAutoConfiguration.class).web(WebApplicationType.NONE)
.properties(env).run();
}
diff --git a/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/greeting-service/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/greeting-service/pom.xml
index 49093b1d..e2172e97 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/greeting-service/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/greeting-service/pom.xml
@@ -6,7 +6,7 @@
org.springframework.cloud
kubernetes-circuitbreaker-ribbon-example
- 0.3.0.RELEASE
+ 1.0.0.BUILD-SNAPSHOT
greeting-service
diff --git a/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/name-service/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/name-service/pom.xml
index 3081a4d4..420ef347 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/name-service/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/name-service/pom.xml
@@ -6,7 +6,7 @@
org.springframework.cloud
kubernetes-circuitbreaker-ribbon-example
- 0.3.0.RELEASE
+ 1.0.0.BUILD-SNAPSHOT
name-service
diff --git a/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/pom.xml
index bce7114b..77174673 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/pom.xml
@@ -6,7 +6,7 @@
spring-cloud-kubernetes-examples
org.springframework.cloud
- 0.3.0.RELEASE
+ 1.0.0.BUILD-SNAPSHOT
org.springframework.cloud
diff --git a/spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml
index 93a5e97e..f6682310 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml
@@ -5,7 +5,7 @@
spring-cloud-kubernetes-examples
org.springframework.cloud
- 0.3.0.RELEASE
+ 1.0.0.BUILD-SNAPSHOT
4.0.0
diff --git a/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml
index 5106a1dd..6c046aac 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml
@@ -5,7 +5,7 @@
spring-cloud-kubernetes-examples
org.springframework.cloud
- 0.3.0.RELEASE
+ 1.0.0.BUILD-SNAPSHOT
4.0.0
diff --git a/spring-cloud-kubernetes-examples/kubernetes-zipkin-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-zipkin-example/pom.xml
index 4e15b2a9..b045cea5 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-zipkin-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-zipkin-example/pom.xml
@@ -5,7 +5,7 @@
spring-cloud-kubernetes-examples
org.springframework.cloud
- 0.3.0.RELEASE
+ 1.0.0.BUILD-SNAPSHOT
4.0.0
diff --git a/spring-cloud-kubernetes-examples/pom.xml b/spring-cloud-kubernetes-examples/pom.xml
index 5f0f874c..2600ed29 100644
--- a/spring-cloud-kubernetes-examples/pom.xml
+++ b/spring-cloud-kubernetes-examples/pom.xml
@@ -6,7 +6,7 @@
spring-cloud-kubernetes
org.springframework.cloud
- 0.3.0.RELEASE
+ 1.0.0.BUILD-SNAPSHOT
spring-cloud-kubernetes-examples
diff --git a/spring-cloud-kubernetes-leader/pom.xml b/spring-cloud-kubernetes-leader/pom.xml
index b1755c6d..0e3014bd 100644
--- a/spring-cloud-kubernetes-leader/pom.xml
+++ b/spring-cloud-kubernetes-leader/pom.xml
@@ -22,7 +22,7 @@
org.springframework.cloud
spring-cloud-kubernetes
- 0.3.0.RELEASE
+ 1.0.0.BUILD-SNAPSHOT
spring-cloud-kubernetes-leader
diff --git a/spring-cloud-kubernetes-ribbon/pom.xml b/spring-cloud-kubernetes-ribbon/pom.xml
index a593a63f..2b4adf85 100644
--- a/spring-cloud-kubernetes-ribbon/pom.xml
+++ b/spring-cloud-kubernetes-ribbon/pom.xml
@@ -22,7 +22,7 @@
spring-cloud-kubernetes
org.springframework.cloud
- 0.3.0.RELEASE
+ 1.0.0.BUILD-SNAPSHOT
4.0.0
diff --git a/spring-cloud-starter-kubernetes-all/pom.xml b/spring-cloud-starter-kubernetes-all/pom.xml
index 6d8a8ed3..35fe3aec 100644
--- a/spring-cloud-starter-kubernetes-all/pom.xml
+++ b/spring-cloud-starter-kubernetes-all/pom.xml
@@ -22,7 +22,7 @@
spring-cloud-kubernetes
org.springframework.cloud
- 0.3.0.RELEASE
+ 1.0.0.BUILD-SNAPSHOT
4.0.0
diff --git a/spring-cloud-starter-kubernetes-config/pom.xml b/spring-cloud-starter-kubernetes-config/pom.xml
index 54090440..e414c66b 100644
--- a/spring-cloud-starter-kubernetes-config/pom.xml
+++ b/spring-cloud-starter-kubernetes-config/pom.xml
@@ -22,7 +22,7 @@
spring-cloud-kubernetes
org.springframework.cloud
- 0.3.0.RELEASE
+ 1.0.0.BUILD-SNAPSHOT
4.0.0
diff --git a/spring-cloud-starter-kubernetes-ribbon/pom.xml b/spring-cloud-starter-kubernetes-ribbon/pom.xml
index a92b6d07..434c5ef5 100644
--- a/spring-cloud-starter-kubernetes-ribbon/pom.xml
+++ b/spring-cloud-starter-kubernetes-ribbon/pom.xml
@@ -22,7 +22,7 @@
spring-cloud-kubernetes
org.springframework.cloud
- 0.3.0.RELEASE
+ 1.0.0.BUILD-SNAPSHOT
4.0.0
diff --git a/spring-cloud-starter-kubernetes/pom.xml b/spring-cloud-starter-kubernetes/pom.xml
index 79819a4a..60c4e38b 100644
--- a/spring-cloud-starter-kubernetes/pom.xml
+++ b/spring-cloud-starter-kubernetes/pom.xml
@@ -21,7 +21,7 @@
spring-cloud-kubernetes
org.springframework.cloud
- 0.3.0.RELEASE
+ 1.0.0.BUILD-SNAPSHOT
4.0.0