diff --git a/CHANGELOG.md b/CHANGELOG.md
index f66f57f4746..dbf038e9048 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,8 +6,15 @@
#### Improvements
+* Dependency cleanup
+ - Remove javax.annotation-api
+ - Remove jaxb-api
+ - Remove jacson-module-jaxb-annotations
+
#### Dependency Upgrade
+* Upgrade sundrio.version to 0.24.1
+
#### New Features
### 5.0.0 (2020-12-30)
diff --git a/extensions/knative/client/pom.xml b/extensions/knative/client/pom.xml
index 2454fac4e9e..cc460c4268a 100755
--- a/extensions/knative/client/pom.xml
+++ b/extensions/knative/client/pom.xml
@@ -68,10 +68,6 @@
io.fabric8
kubernetes-client
-
- com.fasterxml.jackson.module
- jackson-module-jaxb-annotations
-
org.junit.jupiter
junit-jupiter-engine
diff --git a/extensions/knative/model/pom.xml b/extensions/knative/model/pom.xml
index a4dabd8b1c5..ded301a8c2b 100644
--- a/extensions/knative/model/pom.xml
+++ b/extensions/knative/model/pom.xml
@@ -58,10 +58,6 @@
io.fabric8
kubernetes-model-core
-
- com.fasterxml.jackson.module
- jackson-module-jaxb-annotations
-
org.junit.jupiter
junit-jupiter-engine
diff --git a/extensions/tekton/model-triggers/pom.xml b/extensions/tekton/model-triggers/pom.xml
index cc7bbe3aec1..88b21bda465 100644
--- a/extensions/tekton/model-triggers/pom.xml
+++ b/extensions/tekton/model-triggers/pom.xml
@@ -62,10 +62,6 @@
io.fabric8
tekton-model-v1beta1
-
- com.fasterxml.jackson.module
- jackson-module-jaxb-annotations
-
org.junit.jupiter
junit-jupiter-engine
diff --git a/extensions/volumesnapshot/client/pom.xml b/extensions/volumesnapshot/client/pom.xml
index e49f397973f..57346949fb8 100644
--- a/extensions/volumesnapshot/client/pom.xml
+++ b/extensions/volumesnapshot/client/pom.xml
@@ -71,10 +71,6 @@
-
- com.fasterxml.jackson.module
- jackson-module-jaxb-annotations
-
io.sundr
builder-annotations
diff --git a/extensions/volumesnapshot/model/pom.xml b/extensions/volumesnapshot/model/pom.xml
index 610880f09ad..1268be9a504 100755
--- a/extensions/volumesnapshot/model/pom.xml
+++ b/extensions/volumesnapshot/model/pom.xml
@@ -59,10 +59,6 @@
io.fabric8
kubernetes-model-core
-
- com.fasterxml.jackson.module
- jackson-module-jaxb-annotations
-
org.junit.jupiter
junit-jupiter-engine
diff --git a/kubernetes-model-generator/kubernetes-model-common/pom.xml b/kubernetes-model-generator/kubernetes-model-common/pom.xml
index a0f8cfe86d5..f4225ca0757 100644
--- a/kubernetes-model-generator/kubernetes-model-common/pom.xml
+++ b/kubernetes-model-generator/kubernetes-model-common/pom.xml
@@ -28,6 +28,17 @@
bundle
Fabric8 :: Kubernetes Model :: Common
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
+
diff --git a/kubernetes-model-generator/kubernetes-model-common/src/main/java/io/fabric8/kubernetes/model/annotation/Generated.java b/kubernetes-model-generator/kubernetes-model-common/src/main/java/io/fabric8/kubernetes/model/annotation/Generated.java
new file mode 100644
index 00000000000..73b2458e34b
--- /dev/null
+++ b/kubernetes-model-generator/kubernetes-model-common/src/main/java/io/fabric8/kubernetes/model/annotation/Generated.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.fabric8.kubernetes.model.annotation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+import java.lang.annotation.Documented;
+
+/**
+ * Drop-in replacement for javax.annotation.Generated, meant to be used itnernally to avoid bringin in the whole jar.
+ */
+@Documented
+@Retention(SOURCE)
+@Target({PACKAGE, TYPE, ANNOTATION_TYPE, METHOD, CONSTRUCTOR, FIELD,
+ LOCAL_VARIABLE, PARAMETER})
+public @interface Generated {
+
+ /**
+ * The value element must have the name of the code generator.
+ * The recommended convention is to use the fully qualified name of the
+ * code generator. For example: com.acme.generator.CodeGen
.
+ */
+ String[] value();
+
+ /**
+ * Date when the source was generated.
+ */
+ String date() default "";
+
+ /**
+ * A place holder for any comments that the code generator may want to
+ * include in the generated code.
+ */
+ String comments() default "";
+
+}
diff --git a/kubernetes-model-generator/kubernetes-model-coordination/src/main/java/io/fabric8/kubernetes/api/model/coordination/v1/LeaseSpec.java b/kubernetes-model-generator/kubernetes-model-coordination/src/main/java/io/fabric8/kubernetes/api/model/coordination/v1/LeaseSpec.java
index 861d3a37392..0ea3918a776 100644
--- a/kubernetes-model-generator/kubernetes-model-coordination/src/main/java/io/fabric8/kubernetes/api/model/coordination/v1/LeaseSpec.java
+++ b/kubernetes-model-generator/kubernetes-model-coordination/src/main/java/io/fabric8/kubernetes/api/model/coordination/v1/LeaseSpec.java
@@ -15,7 +15,7 @@
*/
package io.fabric8.kubernetes.api.model.coordination.v1;
-import javax.annotation.Generated;
+import io.fabric8.kubernetes.model.annotation.Generated;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -25,7 +25,6 @@
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.fabric8.kubernetes.api.model.KubernetesResource;
import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.Inline;
import lombok.EqualsAndHashCode;
import lombok.ToString;
diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java b/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java
index 1d3a3edd4a7..00ff3bd292e 100644
--- a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java
+++ b/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java
@@ -22,7 +22,8 @@
import io.sundr.builder.annotations.Buildable;
import io.sundr.builder.annotations.Inline;
-import javax.annotation.Generated;
+import io.fabric8.kubernetes.model.annotation.Generated;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/main/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/OperatorVersion.java b/kubernetes-model-generator/openshift-model-operatorhub/src/main/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/OperatorVersion.java
index 67048ce76c4..6f16de98dbe 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/main/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/OperatorVersion.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/main/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/OperatorVersion.java
@@ -16,7 +16,7 @@
package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
import java.util.List;
-import javax.annotation.Generated;
+import io.fabric8.kubernetes.model.annotation.Generated;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
diff --git a/kubernetes-model-generator/openshift-model/src/main/java/io/fabric8/openshift/api/model/Template.java b/kubernetes-model-generator/openshift-model/src/main/java/io/fabric8/openshift/api/model/Template.java
index c778ad2e7e5..1eb2bcbf1a7 100644
--- a/kubernetes-model-generator/openshift-model/src/main/java/io/fabric8/openshift/api/model/Template.java
+++ b/kubernetes-model-generator/openshift-model/src/main/java/io/fabric8/openshift/api/model/Template.java
@@ -35,7 +35,8 @@
import lombok.EqualsAndHashCode;
import lombok.ToString;
-import javax.annotation.Generated;
+import io.fabric8.kubernetes.model.annotation.Generated;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
diff --git a/kubernetes-model-generator/pom.xml b/kubernetes-model-generator/pom.xml
index 61871ba3d03..9e89fc92941 100644
--- a/kubernetes-model-generator/pom.xml
+++ b/kubernetes-model-generator/pom.xml
@@ -70,8 +70,8 @@
- com.fasterxml.jackson.module
- jackson-module-jaxb-annotations
+ com.fasterxml.jackson.core
+ jackson-annotations
@@ -245,18 +245,6 @@
[9,)
-
-
- javax.annotation
- javax.annotation-api
- 1.3.2
-
-
- javax.xml.bind
- jaxb-api
- 2.3.0
-
-
diff --git a/model-annotator/pom.xml b/model-annotator/pom.xml
index 980f1da0469..d5a047b0505 100755
--- a/model-annotator/pom.xml
+++ b/model-annotator/pom.xml
@@ -35,10 +35,6 @@
kubernetes-model-common
${project.version}
-
- com.fasterxml.jackson.module
- jackson-module-jaxb-annotations
-
org.jsonschema2pojo
jsonschema2pojo-core
diff --git a/pom.xml b/pom.xml
index 96125dce9f7..63dd51a378c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
UTF-8
- 0.23.1
+ 0.24.1
3.12.12
3.12.1_1
1.15.0