fix: cleanup uneeded dependencies

fabric8io · Jan 19, 2021 · b2a2bb0 · b2a2bb0
1 parent 54561af
commit b2a2bb0
Show file tree

Hide file tree

Showing 15 changed files with 80 additions and 44 deletions.
diff --git 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
@@ -68,10 +68,6 @@
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-client</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.module</groupId>
-      <artifactId>jackson-module-jaxb-annotations</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>

diff --git a/extensions/knative/model/pom.xml b/extensions/knative/model/pom.xml
@@ -58,10 +58,6 @@
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-model-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.module</groupId>
-      <artifactId>jackson-module-jaxb-annotations</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>

diff --git a/extensions/tekton/model-triggers/pom.xml b/extensions/tekton/model-triggers/pom.xml
@@ -62,10 +62,6 @@
       <groupId>io.fabric8</groupId>
       <artifactId>tekton-model-v1beta1</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.module</groupId>
-      <artifactId>jackson-module-jaxb-annotations</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>

diff --git a/extensions/volumesnapshot/client/pom.xml b/extensions/volumesnapshot/client/pom.xml
@@ -71,10 +71,6 @@
       </exclusions>
     </dependency>
 
-    <dependency>
-      <groupId>com.fasterxml.jackson.module</groupId>
-      <artifactId>jackson-module-jaxb-annotations</artifactId>
-    </dependency>
     <dependency>
       <groupId>io.sundr</groupId>
       <artifactId>builder-annotations</artifactId>

diff --git a/extensions/volumesnapshot/model/pom.xml b/extensions/volumesnapshot/model/pom.xml
@@ -59,10 +59,6 @@
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-model-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.module</groupId>
-      <artifactId>jackson-module-jaxb-annotations</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>

diff --git a/kubernetes-model-generator/kubernetes-model-common/pom.xml b/kubernetes-model-generator/kubernetes-model-common/pom.xml
@@ -28,6 +28,17 @@
   <packaging>bundle</packaging>
   <name>Fabric8 :: Kubernetes Model :: Common</name>
 
+  <dependencies>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+  </dependencies>
+
   <build>
     <plugins>
       <plugin>

diff --git a/...bernetes-model-common/src/main/java/io/fabric8/kubernetes/model/annotation/Generated.java b/...bernetes-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: <code>com.acme.generator.CodeGen</code>.
+    */
+   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/...coordination/src/main/java/io/fabric8/kubernetes/api/model/coordination/v1/LeaseSpec.java b/...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/...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
@@ -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/...ub/src/main/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/OperatorVersion.java b/...ub/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/...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
@@ -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
@@ -70,8 +70,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.fasterxml.jackson.module</groupId>
-      <artifactId>jackson-module-jaxb-annotations</artifactId>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
     </dependency>
 
     <!-- CompileOnly (provided) depdendencies -->
@@ -245,18 +245,6 @@
       <activation>
         <jdk>[9,)</jdk>
       </activation>
-      <dependencies>
-        <dependency>
-          <groupId>javax.annotation</groupId>
-          <artifactId>javax.annotation-api</artifactId>
-          <version>1.3.2</version>
-        </dependency>
-        <dependency>
-          <groupId>javax.xml.bind</groupId>
-          <artifactId>jaxb-api</artifactId>
-          <version>2.3.0</version>
-        </dependency>
-      </dependencies>
       <build>
         <pluginManagement>
           <plugins>

diff --git a/model-annotator/pom.xml b/model-annotator/pom.xml
@@ -35,10 +35,6 @@
       <artifactId>kubernetes-model-common</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.module</groupId>
-      <artifactId>jackson-module-jaxb-annotations</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.jsonschema2pojo</groupId>
       <artifactId>jsonschema2pojo-core</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -79,7 +79,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- Core versions -->
-    <sundrio.version>0.23.1</sundrio.version>
+    <sundrio.version>0.24.1</sundrio.version>
     <okhttp.version>3.12.12</okhttp.version>
     <okhttp.bundle.version>3.12.1_1</okhttp.bundle.version>
     <okio.version>1.15.0</okio.version>