diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ee6235ee20..5abb5780e1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ * Fix #1589: Move HorizontalPodAutoscaler to autoscaling/v1 * Fix #1553: Allow to explicitly set non-matching field selectors using `withoutField` * Cleaned up kubernetes-model pom.xml + * Fix #1661: Remove generic parameter from KubernetesResource Dependency Upgrade diff --git a/kubernetes-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/HasMetadata.java b/kubernetes-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/HasMetadata.java index 2eb2baa84fb..b7171b9f29f 100644 --- a/kubernetes-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/HasMetadata.java +++ b/kubernetes-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/HasMetadata.java @@ -15,7 +15,7 @@ */ package io.fabric8.kubernetes.api.model; -public interface HasMetadata extends KubernetesResource { +public interface HasMetadata> extends KubernetesResource { ObjectMeta getMetadata(); void setMetadata(ObjectMeta metadata); diff --git a/kubernetes-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/KubernetesResource.java b/kubernetes-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/KubernetesResource.java index 809ba69a46d..8bd76099879 100644 --- a/kubernetes-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/KubernetesResource.java +++ b/kubernetes-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/KubernetesResource.java @@ -20,5 +20,5 @@ import java.io.Serializable; @JsonDeserialize(using = KubernetesDeserializer.class) -public interface KubernetesResource extends Serializable { +public interface KubernetesResource extends Serializable { } diff --git a/kubernetes-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/KubernetesResourceList.java b/kubernetes-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/KubernetesResourceList.java index 1d9584bf48e..66b70a2e1c2 100644 --- a/kubernetes-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/KubernetesResourceList.java +++ b/kubernetes-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/KubernetesResourceList.java @@ -22,7 +22,7 @@ import java.io.Serializable; @JsonDeserialize(using = KubernetesDeserializer.class) -public interface KubernetesResourceList extends Serializable { +public interface KubernetesResourceList> extends Serializable { ListMeta getMetadata();