diff --git a/kubernetes-client/pom.xml b/kubernetes-client/pom.xml index b55d76ba98d..91f5e159d97 100644 --- a/kubernetes-client/pom.xml +++ b/kubernetes-client/pom.xml @@ -20,7 +20,7 @@ io.fabric8 kubernetes-client-project - 1.4-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/ExtensionsAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/ExtensionsAPIGroupClient.java index 60da0461155..cbd81d51779 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/ExtensionsAPIGroupClient.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/ExtensionsAPIGroupClient.java @@ -23,15 +23,15 @@ import io.fabric8.kubernetes.api.model.extensions.DoneableDeployment; import io.fabric8.kubernetes.api.model.extensions.DoneableHorizontalPodAutoscaler; import io.fabric8.kubernetes.api.model.extensions.DoneableIngress; -import io.fabric8.kubernetes.api.model.extensions.DoneableJob; +import io.fabric8.kubernetes.api.model.DoneableJob; import io.fabric8.kubernetes.api.model.extensions.DoneableReplicaSet; import io.fabric8.kubernetes.api.model.extensions.DoneableThirdPartyResource; import io.fabric8.kubernetes.api.model.extensions.HorizontalPodAutoscaler; import io.fabric8.kubernetes.api.model.extensions.HorizontalPodAutoscalerList; import io.fabric8.kubernetes.api.model.extensions.Ingress; import io.fabric8.kubernetes.api.model.extensions.IngressList; -import io.fabric8.kubernetes.api.model.extensions.Job; -import io.fabric8.kubernetes.api.model.extensions.JobList; +import io.fabric8.kubernetes.api.model.Job; +import io.fabric8.kubernetes.api.model.JobList; import io.fabric8.kubernetes.api.model.extensions.ReplicaSet; import io.fabric8.kubernetes.api.model.extensions.ReplicaSetList; import io.fabric8.kubernetes.api.model.extensions.ThirdPartyResource; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ExtensionsAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ExtensionsAPIGroupDSL.java index 845b969ac2d..3f1504a9170 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ExtensionsAPIGroupDSL.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ExtensionsAPIGroupDSL.java @@ -24,15 +24,15 @@ import io.fabric8.kubernetes.api.model.extensions.DoneableDeployment; import io.fabric8.kubernetes.api.model.extensions.DoneableHorizontalPodAutoscaler; import io.fabric8.kubernetes.api.model.extensions.DoneableIngress; -import io.fabric8.kubernetes.api.model.extensions.DoneableJob; +import io.fabric8.kubernetes.api.model.DoneableJob; import io.fabric8.kubernetes.api.model.extensions.DoneableReplicaSet; import io.fabric8.kubernetes.api.model.extensions.DoneableThirdPartyResource; import io.fabric8.kubernetes.api.model.extensions.HorizontalPodAutoscaler; import io.fabric8.kubernetes.api.model.extensions.HorizontalPodAutoscalerList; import io.fabric8.kubernetes.api.model.extensions.Ingress; import io.fabric8.kubernetes.api.model.extensions.IngressList; -import io.fabric8.kubernetes.api.model.extensions.Job; -import io.fabric8.kubernetes.api.model.extensions.JobList; +import io.fabric8.kubernetes.api.model.Job; +import io.fabric8.kubernetes.api.model.JobList; import io.fabric8.kubernetes.api.model.extensions.ReplicaSet; import io.fabric8.kubernetes.api.model.extensions.ReplicaSetList; import io.fabric8.kubernetes.api.model.extensions.ThirdPartyResource; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/DeploymentOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/DeploymentOperationsImpl.java index 60dc27096d5..d7f0ed96c46 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/DeploymentOperationsImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/DeploymentOperationsImpl.java @@ -15,7 +15,6 @@ */ package io.fabric8.kubernetes.client.dsl.internal; -import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientTimeoutException; import io.fabric8.kubernetes.client.Watch; import io.fabric8.kubernetes.client.Watcher; @@ -26,8 +25,8 @@ import io.fabric8.kubernetes.api.model.extensions.Deployment; import io.fabric8.kubernetes.api.model.extensions.DeploymentList; import io.fabric8.kubernetes.api.model.extensions.DoneableDeployment; -import io.fabric8.kubernetes.api.model.extensions.LabelSelector; -import io.fabric8.kubernetes.api.model.extensions.LabelSelectorRequirement; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.dsl.ClientScaleableResource; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/JobOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/JobOperationsImpl.java index e46b8980054..3bb3da42b55 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/JobOperationsImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/JobOperationsImpl.java @@ -16,9 +16,9 @@ package io.fabric8.kubernetes.client.dsl.internal; import okhttp3.OkHttpClient; -import io.fabric8.kubernetes.api.model.extensions.DoneableJob; -import io.fabric8.kubernetes.api.model.extensions.Job; -import io.fabric8.kubernetes.api.model.extensions.JobList; +import io.fabric8.kubernetes.api.model.DoneableJob; +import io.fabric8.kubernetes.api.model.Job; +import io.fabric8.kubernetes.api.model.JobList; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.dsl.ClientScaleableResource; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/ReplicaSetRollingUpdater.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/ReplicaSetRollingUpdater.java index 2f6810f0353..51562a9ac16 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/ReplicaSetRollingUpdater.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/ReplicaSetRollingUpdater.java @@ -19,7 +19,7 @@ import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.PodList; import io.fabric8.kubernetes.api.model.extensions.DoneableReplicaSet; -import io.fabric8.kubernetes.api.model.extensions.LabelSelectorRequirement; +import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; import io.fabric8.kubernetes.api.model.extensions.ReplicaSet; import io.fabric8.kubernetes.api.model.extensions.ReplicaSetBuilder; import io.fabric8.kubernetes.api.model.extensions.ReplicaSetList; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/handlers/JobHandler.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/handlers/JobHandler.java index 9346a111405..8cb713c9f51 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/handlers/JobHandler.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/handlers/JobHandler.java @@ -18,8 +18,8 @@ import io.fabric8.kubernetes.client.Watch; import io.fabric8.kubernetes.client.Watcher; import okhttp3.OkHttpClient; -import io.fabric8.kubernetes.api.model.extensions.Job; -import io.fabric8.kubernetes.api.model.extensions.JobBuilder; +import io.fabric8.kubernetes.api.model.Job; +import io.fabric8.kubernetes.api.model.JobBuilder; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.ResourceHandler; import io.fabric8.kubernetes.client.dsl.internal.JobOperationsImpl; diff --git a/kubernetes-examples/pom.xml b/kubernetes-examples/pom.xml index c6a4cc287c5..ec4e34f6e87 100644 --- a/kubernetes-examples/pom.xml +++ b/kubernetes-examples/pom.xml @@ -20,7 +20,7 @@ io.fabric8 kubernetes-client-project - 1.4-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 diff --git a/kubernetes-tests/pom.xml b/kubernetes-tests/pom.xml index e552c1f751f..8a7cf7a9c41 100644 --- a/kubernetes-tests/pom.xml +++ b/kubernetes-tests/pom.xml @@ -22,7 +22,7 @@ kubernetes-client-project io.fabric8 - 1.4-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/JobTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/JobTest.java index 7b848004052..e0902e8e7c5 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/JobTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/JobTest.java @@ -16,10 +16,10 @@ package io.fabric8.kubernetes.client.mock; -import io.fabric8.kubernetes.api.model.extensions.Job; -import io.fabric8.kubernetes.api.model.extensions.JobBuilder; -import io.fabric8.kubernetes.api.model.extensions.JobList; -import io.fabric8.kubernetes.api.model.extensions.JobListBuilder; +import io.fabric8.kubernetes.api.model.Job; +import io.fabric8.kubernetes.api.model.JobBuilder; +import io.fabric8.kubernetes.api.model.JobList; +import io.fabric8.kubernetes.api.model.JobListBuilder; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.server.mock.KubernetesServer; diff --git a/openshift-client/pom.xml b/openshift-client/pom.xml index 375ac7b454f..5db0f357946 100644 --- a/openshift-client/pom.xml +++ b/openshift-client/pom.xml @@ -20,7 +20,7 @@ io.fabric8 kubernetes-client-project - 1.4-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml index 6d4c0f3fb95..6bcc02ea9dc 100644 --- a/platforms/karaf/features/pom.xml +++ b/platforms/karaf/features/pom.xml @@ -20,7 +20,7 @@ karaf io.fabric8.kubernetes - 1.4-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 diff --git a/platforms/karaf/itests/pom.xml b/platforms/karaf/itests/pom.xml index 4fb736a9a6e..ff7d3495a3d 100644 --- a/platforms/karaf/itests/pom.xml +++ b/platforms/karaf/itests/pom.xml @@ -22,7 +22,7 @@ karaf io.fabric8.kubernetes - 1.4-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 diff --git a/platforms/karaf/pom.xml b/platforms/karaf/pom.xml index 6ea390694bb..703baffdc2b 100644 --- a/platforms/karaf/pom.xml +++ b/platforms/karaf/pom.xml @@ -20,7 +20,7 @@ platforms io.fabric8.kubernetes - 1.4-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 diff --git a/platforms/pom.xml b/platforms/pom.xml index 5d30a787118..e7b80a29183 100644 --- a/platforms/pom.xml +++ b/platforms/pom.xml @@ -20,7 +20,7 @@ kubernetes-client-project io.fabric8 - 1.4-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index f92a0431909..9f53d541ed1 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ io.fabric8 kubernetes-client-project - 1.4-SNAPSHOT + 2.0-SNAPSHOT pom Fabric8 :: Kubernetes :: Project @@ -85,7 +85,7 @@ 1.11-8_1 2.7.7 4.12 - 1.0.65 + 1.0.66 2.5 0.3.0