Merge pull request #2310 from joshiste/bugfix/osgi-import

fabric8io · Jun 29, 2020 · 39cd2b4 · 39cd2b4
2 parents da1f6f0 + fdf2c53
commit 39cd2b4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/...netes/internal/HasMetadataComparator.java → ...etes/api/model/HasMetadataComparator.java b/...netes/internal/HasMetadataComparator.java → ...etes/api/model/HasMetadataComparator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.kubernetes.internal;
+package io.fabric8.kubernetes.api.model;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 

diff --git a/...r/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java b/...r/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java
@@ -19,12 +19,10 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.internal.HasMetadataComparator;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
 
 import javax.annotation.Generated;
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

diff --git a/...odel-generator/openshift-model/src/main/java/io/fabric8/openshift/api/model/Template.java b/...odel-generator/openshift-model/src/main/java/io/fabric8/openshift/api/model/Template.java
@@ -27,7 +27,7 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.Namespaced;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.internal.HasMetadataComparator;
+import io.fabric8.kubernetes.api.model.HasMetadataComparator;
 import io.fabric8.kubernetes.model.annotation.ApiGroup;
 import io.fabric8.kubernetes.model.annotation.ApiVersion;
 import io.sundr.builder.annotations.Buildable;