diff --git a/spring-cloud-kubernetes-archaius/src/main/java/io/fabric8/spring/cloud/kubernetes/archaius/ArchaiusConfigMapSource.java b/spring-cloud-kubernetes-archaius/src/main/java/org/springframework/cloud/kubernetes/archaius/ArchaiusConfigMapSource.java similarity index 96% rename from spring-cloud-kubernetes-archaius/src/main/java/io/fabric8/spring/cloud/kubernetes/archaius/ArchaiusConfigMapSource.java rename to spring-cloud-kubernetes-archaius/src/main/java/org/springframework/cloud/kubernetes/archaius/ArchaiusConfigMapSource.java index 838059a1..9e57a84b 100644 --- a/spring-cloud-kubernetes-archaius/src/main/java/io/fabric8/spring/cloud/kubernetes/archaius/ArchaiusConfigMapSource.java +++ b/spring-cloud-kubernetes-archaius/src/main/java/org/springframework/cloud/kubernetes/archaius/ArchaiusConfigMapSource.java @@ -15,7 +15,7 @@ * */ -package io.fabric8.spring.cloud.kubernetes.archaius; +package org.springframework.cloud.kubernetes.archaius; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/spring-cloud-kubernetes-archaius/src/main/java/io/fabric8/spring/cloud/kubernetes/archaius/ArchaiusConfigMapSourceConfiguration.java b/spring-cloud-kubernetes-archaius/src/main/java/org/springframework/cloud/kubernetes/archaius/ArchaiusConfigMapSourceConfiguration.java similarity index 98% rename from spring-cloud-kubernetes-archaius/src/main/java/io/fabric8/spring/cloud/kubernetes/archaius/ArchaiusConfigMapSourceConfiguration.java rename to spring-cloud-kubernetes-archaius/src/main/java/org/springframework/cloud/kubernetes/archaius/ArchaiusConfigMapSourceConfiguration.java index 0899dad5..c60cd9ac 100644 --- a/spring-cloud-kubernetes-archaius/src/main/java/io/fabric8/spring/cloud/kubernetes/archaius/ArchaiusConfigMapSourceConfiguration.java +++ b/spring-cloud-kubernetes-archaius/src/main/java/org/springframework/cloud/kubernetes/archaius/ArchaiusConfigMapSourceConfiguration.java @@ -15,7 +15,7 @@ * */ -package io.fabric8.spring.cloud.kubernetes.archaius; +package org.springframework.cloud.kubernetes.archaius; import com.google.common.base.Strings; import com.netflix.config.WatchedConfigurationSource; diff --git a/spring-cloud-kubernetes-archaius/src/main/java/io/fabric8/spring/cloud/kubernetes/archaius/ArchaiusConfigMapSourceRegistar.java b/spring-cloud-kubernetes-archaius/src/main/java/org/springframework/cloud/kubernetes/archaius/ArchaiusConfigMapSourceRegistar.java similarity index 98% rename from spring-cloud-kubernetes-archaius/src/main/java/io/fabric8/spring/cloud/kubernetes/archaius/ArchaiusConfigMapSourceRegistar.java rename to spring-cloud-kubernetes-archaius/src/main/java/org/springframework/cloud/kubernetes/archaius/ArchaiusConfigMapSourceRegistar.java index 0bbd89da..16f474cf 100644 --- a/spring-cloud-kubernetes-archaius/src/main/java/io/fabric8/spring/cloud/kubernetes/archaius/ArchaiusConfigMapSourceRegistar.java +++ b/spring-cloud-kubernetes-archaius/src/main/java/org/springframework/cloud/kubernetes/archaius/ArchaiusConfigMapSourceRegistar.java @@ -15,7 +15,7 @@ * */ -package io.fabric8.spring.cloud.kubernetes.archaius; +package org.springframework.cloud.kubernetes.archaius; import com.netflix.config.DynamicWatchedConfiguration; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -88,4 +88,4 @@ class ArchaiusConfigMapSourceRegistar implements ImportBeanDefinitionRegistrar { dynamicWatchedConfigBuilder.addConstructorArgReference(configMapSourceConfigName); registry.registerBeanDefinition(dynamicWatchedConfigName, dynamicWatchedConfigBuilder.getBeanDefinition()); } -} \ No newline at end of file +} diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/KubernetesAutoConfiguration.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java similarity index 99% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/KubernetesAutoConfiguration.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java index 449d5516..e6e9795e 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/KubernetesAutoConfiguration.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fabric8.spring.cloud.kubernetes; +package org.springframework.cloud.kubernetes; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.ConfigBuilder; diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/KubernetesClientProperties.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesClientProperties.java similarity index 99% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/KubernetesClientProperties.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesClientProperties.java index e47a2cfe..f7a3ca8b 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/KubernetesClientProperties.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesClientProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fabric8.spring.cloud.kubernetes; +package org.springframework.cloud.kubernetes; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/KubernetesHealthIndicator.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesHealthIndicator.java similarity index 97% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/KubernetesHealthIndicator.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesHealthIndicator.java index c7984f1d..275db8ce 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/KubernetesHealthIndicator.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesHealthIndicator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fabric8.spring.cloud.kubernetes; +package org.springframework.cloud.kubernetes; import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.client.KubernetesClient; @@ -52,4 +52,4 @@ public class KubernetesHealthIndicator extends AbstractHealthIndicator { builder.down(e); } } -} \ No newline at end of file +} diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/LazilyInstantiate.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/LazilyInstantiate.java similarity index 96% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/LazilyInstantiate.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/LazilyInstantiate.java index 3e905dfc..6255ca59 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/LazilyInstantiate.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/LazilyInstantiate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fabric8.spring.cloud.kubernetes; +package org.springframework.cloud.kubernetes; import java.util.function.Supplier; diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/PodUtils.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/PodUtils.java similarity index 95% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/PodUtils.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/PodUtils.java index aeca31d9..856c06dd 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/PodUtils.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/PodUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fabric8.spring.cloud.kubernetes; +package org.springframework.cloud.kubernetes; import io.fabric8.kubernetes.api.model.Pod; diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/StandardPodUtils.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/StandardPodUtils.java similarity index 98% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/StandardPodUtils.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/StandardPodUtils.java index f37e6f29..e58b5248 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/StandardPodUtils.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/StandardPodUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fabric8.spring.cloud.kubernetes; +package org.springframework.cloud.kubernetes; import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.client.Config; diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/AbstractConfigProperties.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/AbstractConfigProperties.java similarity index 95% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/AbstractConfigProperties.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/AbstractConfigProperties.java index f6ac2f2b..d22a7c1f 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/AbstractConfigProperties.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/AbstractConfigProperties.java @@ -15,7 +15,7 @@ * */ -package io.fabric8.spring.cloud.kubernetes.config; +package org.springframework.cloud.kubernetes.config; public abstract class AbstractConfigProperties { diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/BootstrapConfiguration.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/BootstrapConfiguration.java similarity index 94% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/BootstrapConfiguration.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/BootstrapConfiguration.java index 74315b30..3be05274 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/BootstrapConfiguration.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/BootstrapConfiguration.java @@ -15,12 +15,12 @@ * */ -package io.fabric8.spring.cloud.kubernetes.config; +package org.springframework.cloud.kubernetes.config; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.spring.cloud.kubernetes.KubernetesAutoConfiguration; +import org.springframework.cloud.kubernetes.KubernetesAutoConfiguration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/ConfigMapConfigProperties.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapConfigProperties.java similarity index 94% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/ConfigMapConfigProperties.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapConfigProperties.java index 15f63b39..df0ecc62 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/ConfigMapConfigProperties.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapConfigProperties.java @@ -15,7 +15,7 @@ * */ -package io.fabric8.spring.cloud.kubernetes.config; +package org.springframework.cloud.kubernetes.config; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/ConfigMapPropertySource.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySource.java similarity index 98% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/ConfigMapPropertySource.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySource.java index 42347216..d26cd499 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/ConfigMapPropertySource.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySource.java @@ -15,7 +15,7 @@ * */ -package io.fabric8.spring.cloud.kubernetes.config; +package org.springframework.cloud.kubernetes.config; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/ConfigMapPropertySourceLocator.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySourceLocator.java similarity index 93% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/ConfigMapPropertySourceLocator.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySourceLocator.java index 7e3573c6..0bf7c819 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/ConfigMapPropertySourceLocator.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySourceLocator.java @@ -15,7 +15,7 @@ * */ -package io.fabric8.spring.cloud.kubernetes.config; +package org.springframework.cloud.kubernetes.config; import io.fabric8.kubernetes.client.KubernetesClient; import org.springframework.cloud.bootstrap.config.PropertySourceLocator; @@ -23,7 +23,7 @@ import org.springframework.core.annotation.Order; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.Environment; import org.springframework.core.env.MapPropertySource; -import static io.fabric8.spring.cloud.kubernetes.config.ConfigUtils.*; +import static org.springframework.cloud.kubernetes.config.ConfigUtils.*; @Order(0) public class ConfigMapPropertySourceLocator implements PropertySourceLocator { diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/ConfigUtils.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/ConfigUtils.java similarity index 96% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/ConfigUtils.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/ConfigUtils.java index 214cf373..ef9ea519 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/ConfigUtils.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/ConfigUtils.java @@ -1,4 +1,4 @@ -package io.fabric8.spring.cloud.kubernetes.config; +package org.springframework.cloud.kubernetes.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/Constants.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/Constants.java similarity index 94% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/Constants.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/Constants.java index b3e46800..97695ffc 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/Constants.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/Constants.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.fabric8.spring.cloud.kubernetes.config; +package org.springframework.cloud.kubernetes.config; final class Constants { static final String SPRING_APPLICATION_NAME = "spring.application.name"; diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/SecretsConfigProperties.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/SecretsConfigProperties.java similarity index 96% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/SecretsConfigProperties.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/SecretsConfigProperties.java index 25b6173a..3ab63a00 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/SecretsConfigProperties.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/SecretsConfigProperties.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.fabric8.spring.cloud.kubernetes.config; +package org.springframework.cloud.kubernetes.config; import java.util.HashMap; import java.util.LinkedList; diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/SecretsPropertySource.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySource.java similarity index 97% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/SecretsPropertySource.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySource.java index 22884499..508ffea1 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/SecretsPropertySource.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySource.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.fabric8.spring.cloud.kubernetes.config; +package org.springframework.cloud.kubernetes.config; import java.io.IOException; import java.nio.file.Files; @@ -32,7 +32,7 @@ import org.springframework.core.env.Environment; import org.springframework.core.env.MapPropertySource; import org.springframework.util.StringUtils; -import static io.fabric8.spring.cloud.kubernetes.config.ConfigUtils.*; +import static org.springframework.cloud.kubernetes.config.ConfigUtils.*; public class SecretsPropertySource extends MapPropertySource { private static final Logger LOGGER = LoggerFactory.getLogger(SecretsPropertySource.class); diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/SecretsPropertySourceLocator.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySourceLocator.java similarity index 96% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/SecretsPropertySourceLocator.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySourceLocator.java index 1b36e1bd..6674e920 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/config/SecretsPropertySourceLocator.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySourceLocator.java @@ -15,7 +15,7 @@ * */ -package io.fabric8.spring.cloud.kubernetes.config; +package org.springframework.cloud.kubernetes.config; import io.fabric8.kubernetes.client.KubernetesClient; import org.springframework.cloud.bootstrap.config.PropertySourceLocator; diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/profile/KubernetesApplicationContextInitializer.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/profile/KubernetesApplicationContextInitializer.java similarity index 91% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/profile/KubernetesApplicationContextInitializer.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/profile/KubernetesApplicationContextInitializer.java index b5e65561..04effa2e 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/profile/KubernetesApplicationContextInitializer.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/profile/KubernetesApplicationContextInitializer.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.fabric8.spring.cloud.kubernetes.profile; +package org.springframework.cloud.kubernetes.profile; import io.fabric8.kubernetes.client.DefaultKubernetesClient; -import io.fabric8.spring.cloud.kubernetes.PodUtils; -import io.fabric8.spring.cloud.kubernetes.StandardPodUtils; +import org.springframework.cloud.kubernetes.PodUtils; +import org.springframework.cloud.kubernetes.StandardPodUtils; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.Ordered; @@ -52,4 +52,4 @@ public class KubernetesApplicationContextInitializer implements public void initialize(ConfigurableApplicationContext applicationContext) { listener.addKubernetesProfile(applicationContext.getEnvironment()); } -} \ No newline at end of file +} diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/profile/KubernetesProfileApplicationListener.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/profile/KubernetesProfileApplicationListener.java similarity index 96% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/profile/KubernetesProfileApplicationListener.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/profile/KubernetesProfileApplicationListener.java index b6ac779c..0299cb49 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/profile/KubernetesProfileApplicationListener.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/profile/KubernetesProfileApplicationListener.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.fabric8.spring.cloud.kubernetes.profile; +package org.springframework.cloud.kubernetes.profile; import io.fabric8.kubernetes.api.model.Pod; -import io.fabric8.spring.cloud.kubernetes.PodUtils; +import org.springframework.cloud.kubernetes.PodUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/reload/ConfigReloadAutoConfiguration.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigReloadAutoConfiguration.java similarity index 95% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/reload/ConfigReloadAutoConfiguration.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigReloadAutoConfiguration.java index cb481867..af3d3534 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/reload/ConfigReloadAutoConfiguration.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigReloadAutoConfiguration.java @@ -14,11 +14,11 @@ * limitations under the License. * */ -package io.fabric8.spring.cloud.kubernetes.reload; +package org.springframework.cloud.kubernetes.reload; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.spring.cloud.kubernetes.config.ConfigMapPropertySourceLocator; -import io.fabric8.spring.cloud.kubernetes.config.SecretsPropertySourceLocator; +import org.springframework.cloud.kubernetes.config.ConfigMapPropertySourceLocator; +import org.springframework.cloud.kubernetes.config.SecretsPropertySourceLocator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/reload/ConfigReloadProperties.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigReloadProperties.java similarity index 98% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/reload/ConfigReloadProperties.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigReloadProperties.java index ebfd638c..52cd2793 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/reload/ConfigReloadProperties.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigReloadProperties.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.fabric8.spring.cloud.kubernetes.reload; +package org.springframework.cloud.kubernetes.reload; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/reload/ConfigurationChangeDetector.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigurationChangeDetector.java similarity index 98% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/reload/ConfigurationChangeDetector.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigurationChangeDetector.java index 0d1b64d5..e01e6d5c 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/reload/ConfigurationChangeDetector.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigurationChangeDetector.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.fabric8.spring.cloud.kubernetes.reload; +package org.springframework.cloud.kubernetes.reload; import java.util.LinkedList; import java.util.List; diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/reload/ConfigurationUpdateStrategy.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigurationUpdateStrategy.java similarity index 96% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/reload/ConfigurationUpdateStrategy.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigurationUpdateStrategy.java index d6cb2341..87d2d7f4 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/reload/ConfigurationUpdateStrategy.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigurationUpdateStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.fabric8.spring.cloud.kubernetes.reload; +package org.springframework.cloud.kubernetes.reload; import java.util.Objects; diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/reload/EventBasedConfigurationChangeDetector.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/EventBasedConfigurationChangeDetector.java similarity index 94% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/reload/EventBasedConfigurationChangeDetector.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/EventBasedConfigurationChangeDetector.java index 7b670762..6500c6f8 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/reload/EventBasedConfigurationChangeDetector.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/EventBasedConfigurationChangeDetector.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.fabric8.spring.cloud.kubernetes.reload; +package org.springframework.cloud.kubernetes.reload; import java.util.HashMap; import java.util.Map; @@ -27,10 +27,10 @@ import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.Watch; import io.fabric8.kubernetes.client.Watcher; -import io.fabric8.spring.cloud.kubernetes.config.ConfigMapPropertySource; -import io.fabric8.spring.cloud.kubernetes.config.ConfigMapPropertySourceLocator; -import io.fabric8.spring.cloud.kubernetes.config.SecretsPropertySource; -import io.fabric8.spring.cloud.kubernetes.config.SecretsPropertySourceLocator; +import org.springframework.cloud.kubernetes.config.ConfigMapPropertySource; +import org.springframework.cloud.kubernetes.config.ConfigMapPropertySourceLocator; +import org.springframework.cloud.kubernetes.config.SecretsPropertySource; +import org.springframework.cloud.kubernetes.config.SecretsPropertySourceLocator; import org.springframework.core.env.AbstractEnvironment; import org.springframework.core.env.MapPropertySource; diff --git a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/reload/PollingConfigurationChangeDetector.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/PollingConfigurationChangeDetector.java similarity index 90% rename from spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/reload/PollingConfigurationChangeDetector.java rename to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/PollingConfigurationChangeDetector.java index 80e4e6ec..c8bfe211 100644 --- a/spring-cloud-kubernetes-core/src/main/java/io/fabric8/spring/cloud/kubernetes/reload/PollingConfigurationChangeDetector.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/PollingConfigurationChangeDetector.java @@ -14,15 +14,15 @@ * limitations under the License. * */ -package io.fabric8.spring.cloud.kubernetes.reload; +package org.springframework.cloud.kubernetes.reload; import javax.annotation.PostConstruct; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.spring.cloud.kubernetes.config.ConfigMapPropertySource; -import io.fabric8.spring.cloud.kubernetes.config.ConfigMapPropertySourceLocator; -import io.fabric8.spring.cloud.kubernetes.config.SecretsPropertySource; -import io.fabric8.spring.cloud.kubernetes.config.SecretsPropertySourceLocator; +import org.springframework.cloud.kubernetes.config.ConfigMapPropertySource; +import org.springframework.cloud.kubernetes.config.ConfigMapPropertySourceLocator; +import org.springframework.cloud.kubernetes.config.SecretsPropertySource; +import org.springframework.cloud.kubernetes.config.SecretsPropertySourceLocator; import org.springframework.core.env.AbstractEnvironment; import org.springframework.core.env.MapPropertySource; diff --git a/spring-cloud-kubernetes-core/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-core/src/main/resources/META-INF/spring.factories index b1ba6a70..564f5b0d 100644 --- a/spring-cloud-kubernetes-core/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-kubernetes-core/src/main/resources/META-INF/spring.factories @@ -1,9 +1,9 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -io.fabric8.spring.cloud.kubernetes.KubernetesAutoConfiguration,\ -io.fabric8.spring.cloud.kubernetes.reload.ConfigReloadAutoConfiguration +org.springframework.cloud.kubernetes.KubernetesAutoConfiguration,\ +org.springframework.cloud.kubernetes.reload.ConfigReloadAutoConfiguration org.springframework.cloud.bootstrap.BootstrapConfiguration=\ -io.fabric8.spring.cloud.kubernetes.config.BootstrapConfiguration +org.springframework.cloud.kubernetes.config.BootstrapConfiguration org.springframework.context.ApplicationContextInitializer=\ -io.fabric8.spring.cloud.kubernetes.profile.KubernetesApplicationContextInitializer +org.springframework.cloud.kubernetes.profile.KubernetesApplicationContextInitializer diff --git a/spring-cloud-kubernetes-core/src/test/groovy/io/fabric8/spring/cloud/kubernetes/config/test/CoreTest.groovy b/spring-cloud-kubernetes-core/src/test/groovy/io/fabric8/spring/cloud/kubernetes/config/test/CoreTest.groovy index bff4f97c..e850b420 100644 --- a/spring-cloud-kubernetes-core/src/test/groovy/io/fabric8/spring/cloud/kubernetes/config/test/CoreTest.groovy +++ b/spring-cloud-kubernetes-core/src/test/groovy/io/fabric8/spring/cloud/kubernetes/config/test/CoreTest.groovy @@ -15,7 +15,7 @@ * */ -package io.fabric8.spring.cloud.kubernetes.config.test +package org.springframework.cloud.kubernetes.config.test import io.fabric8.kubernetes.api.model.SecretBuilder import io.fabric8.kubernetes.api.model.ConfigMapBuilder diff --git a/spring-cloud-kubernetes-core/src/test/groovy/io/fabric8/spring/cloud/kubernetes/config/test/TestApplication.groovy b/spring-cloud-kubernetes-core/src/test/groovy/io/fabric8/spring/cloud/kubernetes/config/test/TestApplication.groovy index 8075ccae..e1c172cc 100644 --- a/spring-cloud-kubernetes-core/src/test/groovy/io/fabric8/spring/cloud/kubernetes/config/test/TestApplication.groovy +++ b/spring-cloud-kubernetes-core/src/test/groovy/io/fabric8/spring/cloud/kubernetes/config/test/TestApplication.groovy @@ -15,7 +15,7 @@ * */ -package io.fabric8.spring.cloud.kubernetes.config.test +package org.springframework.cloud.kubernetes.config.test import org.springframework.boot.SpringApplication import org.springframework.boot.autoconfigure.SpringBootApplication @@ -26,4 +26,4 @@ class TestApplication { def main(String[] args) { SpringApplication.run(TestApplication.class, args); } -} \ No newline at end of file +} diff --git a/spring-cloud-kubernetes-discovery/src/main/java/io/fabric8/spring/cloud/discovery/KubernetesDiscoveryClient.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClient.java similarity index 98% rename from spring-cloud-kubernetes-discovery/src/main/java/io/fabric8/spring/cloud/discovery/KubernetesDiscoveryClient.java rename to spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClient.java index e8fbfcef..812ce1dd 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/io/fabric8/spring/cloud/discovery/KubernetesDiscoveryClient.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClient.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fabric8.spring.cloud.discovery; +package org.springframework.cloud.kubernetes.discovery; import io.fabric8.kubernetes.api.model.Endpoints; import io.fabric8.kubernetes.client.KubernetesClient; diff --git a/spring-cloud-kubernetes-discovery/src/main/java/io/fabric8/spring/cloud/discovery/KubernetesDiscoveryClientConfiguration.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfiguration.java similarity index 96% rename from spring-cloud-kubernetes-discovery/src/main/java/io/fabric8/spring/cloud/discovery/KubernetesDiscoveryClientConfiguration.java rename to spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfiguration.java index e0d01fa1..824edf61 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/io/fabric8/spring/cloud/discovery/KubernetesDiscoveryClientConfiguration.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fabric8.spring.cloud.discovery; +package org.springframework.cloud.kubernetes.discovery; import io.fabric8.kubernetes.client.KubernetesClient; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/spring-cloud-kubernetes-discovery/src/main/java/io/fabric8/spring/cloud/discovery/KubernetesDiscoveryLifecycle.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryLifecycle.java similarity index 97% rename from spring-cloud-kubernetes-discovery/src/main/java/io/fabric8/spring/cloud/discovery/KubernetesDiscoveryLifecycle.java rename to spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryLifecycle.java index 411dcb71..274a8982 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/io/fabric8/spring/cloud/discovery/KubernetesDiscoveryLifecycle.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryLifecycle.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fabric8.spring.cloud.discovery; +package org.springframework.cloud.kubernetes.discovery; import io.fabric8.kubernetes.client.KubernetesClient; import org.springframework.cloud.client.discovery.AbstractDiscoveryLifecycle; diff --git a/spring-cloud-kubernetes-discovery/src/main/java/io/fabric8/spring/cloud/discovery/KubernetesDiscoveryProperties.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryProperties.java similarity index 95% rename from spring-cloud-kubernetes-discovery/src/main/java/io/fabric8/spring/cloud/discovery/KubernetesDiscoveryProperties.java rename to spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryProperties.java index 5aa74fee..26b5a21f 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/io/fabric8/spring/cloud/discovery/KubernetesDiscoveryProperties.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fabric8.spring.cloud.discovery; +package org.springframework.cloud.kubernetes.discovery; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/spring-cloud-kubernetes-discovery/src/main/java/io/fabric8/spring/cloud/discovery/KubernetesServiceInstance.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesServiceInstance.java similarity index 97% rename from spring-cloud-kubernetes-discovery/src/main/java/io/fabric8/spring/cloud/discovery/KubernetesServiceInstance.java rename to spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesServiceInstance.java index 0ee93efd..6d4be1d2 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/io/fabric8/spring/cloud/discovery/KubernetesServiceInstance.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesServiceInstance.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fabric8.spring.cloud.discovery; +package org.springframework.cloud.kubernetes.discovery; import io.fabric8.kubernetes.api.model.EndpointAddress; import io.fabric8.kubernetes.api.model.EndpointPort; diff --git a/spring-cloud-kubernetes-discovery/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-discovery/src/main/resources/META-INF/spring.factories index b720e81d..a542fcb2 100644 --- a/spring-cloud-kubernetes-discovery/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-kubernetes-discovery/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ # Discovery Client Configuration org.springframework.cloud.client.discovery.EnableDiscoveryClient=\ -io.fabric8.spring.cloud.discovery.KubernetesDiscoveryClientConfiguration \ No newline at end of file +org.springframework.cloud.kubernetes.discovery.KubernetesDiscoveryClientConfiguration diff --git a/spring-cloud-kubernetes-discovery/src/test/groovy/io/fabric8/spring/cloud/discovery/KubernetesDiscoveryClientTest.groovy b/spring-cloud-kubernetes-discovery/src/test/groovy/io/fabric8/spring/cloud/discovery/KubernetesDiscoveryClientTest.groovy index d89f108f..5db50a83 100644 --- a/spring-cloud-kubernetes-discovery/src/test/groovy/io/fabric8/spring/cloud/discovery/KubernetesDiscoveryClientTest.groovy +++ b/spring-cloud-kubernetes-discovery/src/test/groovy/io/fabric8/spring/cloud/discovery/KubernetesDiscoveryClientTest.groovy @@ -1,4 +1,4 @@ -package io.fabric8.spring.cloud.discovery +package org.springframework.cloud.kubernetes.discovery import io.fabric8.kubernetes.api.model.EndpointsBuilder import io.fabric8.kubernetes.client.Config diff --git a/spring-cloud-kubernetes-examples/kubernetes-reload-example/src/main/java/io/fabric8/spring/cloud/kubernetes/examples/App.java b/spring-cloud-kubernetes-examples/kubernetes-reload-example/src/main/java/io/fabric8/spring/cloud/kubernetes/examples/App.java index d5389034..000892e0 100644 --- a/spring-cloud-kubernetes-examples/kubernetes-reload-example/src/main/java/io/fabric8/spring/cloud/kubernetes/examples/App.java +++ b/spring-cloud-kubernetes-examples/kubernetes-reload-example/src/main/java/io/fabric8/spring/cloud/kubernetes/examples/App.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.fabric8.spring.cloud.kubernetes.examples; +package org.springframework.cloud.kubernetes.examples; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-cloud-kubernetes-examples/kubernetes-reload-example/src/main/java/io/fabric8/spring/cloud/kubernetes/examples/MyBean.java b/spring-cloud-kubernetes-examples/kubernetes-reload-example/src/main/java/io/fabric8/spring/cloud/kubernetes/examples/MyBean.java index 3c141ff3..e13ca7be 100644 --- a/spring-cloud-kubernetes-examples/kubernetes-reload-example/src/main/java/io/fabric8/spring/cloud/kubernetes/examples/MyBean.java +++ b/spring-cloud-kubernetes-examples/kubernetes-reload-example/src/main/java/io/fabric8/spring/cloud/kubernetes/examples/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.fabric8.spring.cloud.kubernetes.examples; +package org.springframework.cloud.kubernetes.examples; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; diff --git a/spring-cloud-kubernetes-examples/kubernetes-reload-example/src/main/java/io/fabric8/spring/cloud/kubernetes/examples/MyConfig.java b/spring-cloud-kubernetes-examples/kubernetes-reload-example/src/main/java/io/fabric8/spring/cloud/kubernetes/examples/MyConfig.java index 513800d4..b898906c 100644 --- a/spring-cloud-kubernetes-examples/kubernetes-reload-example/src/main/java/io/fabric8/spring/cloud/kubernetes/examples/MyConfig.java +++ b/spring-cloud-kubernetes-examples/kubernetes-reload-example/src/main/java/io/fabric8/spring/cloud/kubernetes/examples/MyConfig.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.fabric8.spring.cloud.kubernetes.examples; +package org.springframework.cloud.kubernetes.examples; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/spring-cloud-kubernetes-hystrix/src/main/java/io/fabric8/spring/cloud/kubernetes/hystrix/HystrixFilterAutoConfiguration.java b/spring-cloud-kubernetes-hystrix/src/main/java/org/springframework/cloud/kubernetes/hystrix/HystrixFilterAutoConfiguration.java similarity index 96% rename from spring-cloud-kubernetes-hystrix/src/main/java/io/fabric8/spring/cloud/kubernetes/hystrix/HystrixFilterAutoConfiguration.java rename to spring-cloud-kubernetes-hystrix/src/main/java/org/springframework/cloud/kubernetes/hystrix/HystrixFilterAutoConfiguration.java index f2183f4b..cd2b7d86 100644 --- a/spring-cloud-kubernetes-hystrix/src/main/java/io/fabric8/spring/cloud/kubernetes/hystrix/HystrixFilterAutoConfiguration.java +++ b/spring-cloud-kubernetes-hystrix/src/main/java/org/springframework/cloud/kubernetes/hystrix/HystrixFilterAutoConfiguration.java @@ -15,7 +15,7 @@ * */ -package io.fabric8.spring.cloud.kubernetes.hystrix; +package org.springframework.cloud.kubernetes.hystrix; import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/spring-cloud-kubernetes-hystrix/src/main/java/io/fabric8/spring/cloud/kubernetes/hystrix/HystrixRequestContextServletFilter.java b/spring-cloud-kubernetes-hystrix/src/main/java/org/springframework/cloud/kubernetes/hystrix/HystrixRequestContextServletFilter.java similarity index 96% rename from spring-cloud-kubernetes-hystrix/src/main/java/io/fabric8/spring/cloud/kubernetes/hystrix/HystrixRequestContextServletFilter.java rename to spring-cloud-kubernetes-hystrix/src/main/java/org/springframework/cloud/kubernetes/hystrix/HystrixRequestContextServletFilter.java index a8f6bb8b..102790ce 100644 --- a/spring-cloud-kubernetes-hystrix/src/main/java/io/fabric8/spring/cloud/kubernetes/hystrix/HystrixRequestContextServletFilter.java +++ b/spring-cloud-kubernetes-hystrix/src/main/java/org/springframework/cloud/kubernetes/hystrix/HystrixRequestContextServletFilter.java @@ -15,7 +15,7 @@ * */ -package io.fabric8.spring.cloud.kubernetes.hystrix; +package org.springframework.cloud.kubernetes.hystrix; import com.netflix.hystrix.strategy.concurrency.HystrixRequestContext; import org.springframework.web.filter.OncePerRequestFilter; @@ -38,4 +38,4 @@ public class HystrixRequestContextServletFilter extends OncePerRequestFilter { } } -} \ No newline at end of file +} diff --git a/spring-cloud-kubernetes-hystrix/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-hystrix/src/main/resources/META-INF/spring.factories index 21ca389f..831784ad 100644 --- a/spring-cloud-kubernetes-hystrix/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-kubernetes-hystrix/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -io.fabric8.spring.cloud.kubernetes.hystrix.HystrixFilterAutoConfiguration \ No newline at end of file +org.springframework.cloud.kubernetes.hystrix.HystrixFilterAutoConfiguration diff --git a/spring-cloud-kubernetes-ribbon/src/main/java/io/fabric8/spring/cloud/kubernetes/ribbon/KubernetesConfigKey.java b/spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/KubernetesConfigKey.java similarity index 98% rename from spring-cloud-kubernetes-ribbon/src/main/java/io/fabric8/spring/cloud/kubernetes/ribbon/KubernetesConfigKey.java rename to spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/KubernetesConfigKey.java index e2dd5f1a..307e1590 100644 --- a/spring-cloud-kubernetes-ribbon/src/main/java/io/fabric8/spring/cloud/kubernetes/ribbon/KubernetesConfigKey.java +++ b/spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/KubernetesConfigKey.java @@ -15,7 +15,7 @@ * */ -package io.fabric8.spring.cloud.kubernetes.ribbon; +package org.springframework.cloud.kubernetes.ribbon; import com.google.common.reflect.TypeToken; import com.netflix.client.config.IClientConfigKey; diff --git a/spring-cloud-kubernetes-ribbon/src/main/java/io/fabric8/spring/cloud/kubernetes/ribbon/KubernetesRibbonClientConfiguration.java b/spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/KubernetesRibbonClientConfiguration.java similarity index 96% rename from spring-cloud-kubernetes-ribbon/src/main/java/io/fabric8/spring/cloud/kubernetes/ribbon/KubernetesRibbonClientConfiguration.java rename to spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/KubernetesRibbonClientConfiguration.java index 146792bd..15357197 100644 --- a/spring-cloud-kubernetes-ribbon/src/main/java/io/fabric8/spring/cloud/kubernetes/ribbon/KubernetesRibbonClientConfiguration.java +++ b/spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/KubernetesRibbonClientConfiguration.java @@ -15,7 +15,7 @@ * */ -package io.fabric8.spring.cloud.kubernetes.ribbon; +package org.springframework.cloud.kubernetes.ribbon; import com.netflix.client.config.IClientConfig; import com.netflix.loadbalancer.ServerList; diff --git a/spring-cloud-kubernetes-ribbon/src/main/java/io/fabric8/spring/cloud/kubernetes/ribbon/KubernetesServerList.java b/spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/KubernetesServerList.java similarity index 98% rename from spring-cloud-kubernetes-ribbon/src/main/java/io/fabric8/spring/cloud/kubernetes/ribbon/KubernetesServerList.java rename to spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/KubernetesServerList.java index 67176972..ff812ec3 100644 --- a/spring-cloud-kubernetes-ribbon/src/main/java/io/fabric8/spring/cloud/kubernetes/ribbon/KubernetesServerList.java +++ b/spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/KubernetesServerList.java @@ -15,7 +15,7 @@ * */ -package io.fabric8.spring.cloud.kubernetes.ribbon; +package org.springframework.cloud.kubernetes.ribbon; import com.netflix.client.config.IClientConfig; import com.netflix.loadbalancer.AbstractServerList; diff --git a/spring-cloud-kubernetes-ribbon/src/main/java/io/fabric8/spring/cloud/kubernetes/ribbon/RibbonKubernetesAutoConfiguration.java b/spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/RibbonKubernetesAutoConfiguration.java similarity index 96% rename from spring-cloud-kubernetes-ribbon/src/main/java/io/fabric8/spring/cloud/kubernetes/ribbon/RibbonKubernetesAutoConfiguration.java rename to spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/RibbonKubernetesAutoConfiguration.java index be2a0038..9e2ed300 100644 --- a/spring-cloud-kubernetes-ribbon/src/main/java/io/fabric8/spring/cloud/kubernetes/ribbon/RibbonKubernetesAutoConfiguration.java +++ b/spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/RibbonKubernetesAutoConfiguration.java @@ -15,7 +15,7 @@ * */ -package io.fabric8.spring.cloud.kubernetes.ribbon; +package org.springframework.cloud.kubernetes.ribbon; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; diff --git a/spring-cloud-kubernetes-ribbon/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-ribbon/src/main/resources/META-INF/spring.factories index c93cffa8..e118428d 100644 --- a/spring-cloud-kubernetes-ribbon/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-kubernetes-ribbon/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -io.fabric8.spring.cloud.kubernetes.ribbon.RibbonKubernetesAutoConfiguration \ No newline at end of file +org.springframework.cloud.kubernetes.ribbon.RibbonKubernetesAutoConfiguration diff --git a/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy b/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy index ef68edc9..1792d0be 100644 --- a/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy +++ b/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy @@ -15,13 +15,13 @@ * */ -package io.fabric8.spring.cloud.kubernetes.ribbon.test +package org.springframework.cloud.kubernetes.ribbon.test import io.fabric8.kubernetes.api.model.EndpointsBuilder import io.fabric8.kubernetes.client.Config import io.fabric8.kubernetes.client.KubernetesClient import io.fabric8.kubernetes.server.mock.KubernetesMockServer -import io.fabric8.spring.cloud.kubernetes.ribbon.KubernetesRibbonClientConfiguration +import org.springframework.cloud.kubernetes.ribbon.KubernetesRibbonClientConfiguration import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.EnableAutoConfiguration import org.springframework.boot.test.IntegrationTest diff --git a/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/TestApplication.groovy b/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/TestApplication.groovy index 99a9a1ab..04e5a630 100644 --- a/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/TestApplication.groovy +++ b/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/TestApplication.groovy @@ -15,7 +15,7 @@ * */ -package io.fabric8.spring.cloud.kubernetes.ribbon.test +package org.springframework.cloud.kubernetes.ribbon.test import org.springframework.boot.SpringApplication import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.cloud.client.loadbalancer.LoadBalanced @@ -34,4 +34,4 @@ class TestApplication { def RestTemplate restTemplate() { return new RestTemplate(); } -} \ No newline at end of file +} diff --git a/spring-cloud-kubernetes-zipkin/src/main/java/io/fabric8/spring/cloud/kubernetes/zipkin/KubernetesZipkinDiscoveryProperties.java b/spring-cloud-kubernetes-zipkin/src/main/java/org/springframework/cloud/kubernetes/zipkin/KubernetesZipkinDiscoveryProperties.java similarity index 96% rename from spring-cloud-kubernetes-zipkin/src/main/java/io/fabric8/spring/cloud/kubernetes/zipkin/KubernetesZipkinDiscoveryProperties.java rename to spring-cloud-kubernetes-zipkin/src/main/java/org/springframework/cloud/kubernetes/zipkin/KubernetesZipkinDiscoveryProperties.java index 44469840..43e6d17e 100644 --- a/spring-cloud-kubernetes-zipkin/src/main/java/io/fabric8/spring/cloud/kubernetes/zipkin/KubernetesZipkinDiscoveryProperties.java +++ b/spring-cloud-kubernetes-zipkin/src/main/java/org/springframework/cloud/kubernetes/zipkin/KubernetesZipkinDiscoveryProperties.java @@ -15,7 +15,7 @@ * */ -package io.fabric8.spring.cloud.kubernetes.zipkin; +package org.springframework.cloud.kubernetes.zipkin; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/spring-cloud-kubernetes-zipkin/src/main/java/io/fabric8/spring/cloud/kubernetes/zipkin/ZipkinKubernetesAutoConfiguration.java b/spring-cloud-kubernetes-zipkin/src/main/java/org/springframework/cloud/kubernetes/zipkin/ZipkinKubernetesAutoConfiguration.java similarity index 96% rename from spring-cloud-kubernetes-zipkin/src/main/java/io/fabric8/spring/cloud/kubernetes/zipkin/ZipkinKubernetesAutoConfiguration.java rename to spring-cloud-kubernetes-zipkin/src/main/java/org/springframework/cloud/kubernetes/zipkin/ZipkinKubernetesAutoConfiguration.java index 2210d610..ee5df910 100644 --- a/spring-cloud-kubernetes-zipkin/src/main/java/io/fabric8/spring/cloud/kubernetes/zipkin/ZipkinKubernetesAutoConfiguration.java +++ b/spring-cloud-kubernetes-zipkin/src/main/java/org/springframework/cloud/kubernetes/zipkin/ZipkinKubernetesAutoConfiguration.java @@ -15,12 +15,12 @@ * */ -package io.fabric8.spring.cloud.kubernetes.zipkin; +package org.springframework.cloud.kubernetes.zipkin; import io.fabric8.kubernetes.api.model.Endpoints; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.utils.Utils; -import io.fabric8.spring.cloud.discovery.KubernetesServiceInstance; +import org.springframework.cloud.kubernetes.discovery.KubernetesServiceInstance; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.AutoConfigureBefore; diff --git a/spring-cloud-kubernetes-zipkin/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-zipkin/src/main/resources/META-INF/spring.factories index b7eb7dae..aceffa6e 100644 --- a/spring-cloud-kubernetes-zipkin/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-kubernetes-zipkin/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -io.fabric8.spring.cloud.kubernetes.zipkin.ZipkinKubernetesAutoConfiguration \ No newline at end of file +org.springframework.cloud.kubernetes.zipkin.ZipkinKubernetesAutoConfiguration