Merge remote-tracking branch 'origin/develop' into template-fix

Author: rjeberhard

buildtime-reports/pom.xml

@@ -52,11 +52,6 @@
     </profiles>
 
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>operator-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>weblogic-kubernetes-operator</artifactId>

operator/pom.xml

@@ -220,11 +220,20 @@
       <artifactId>operator-swagger</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>json-schema</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.swagger</groupId>
       <artifactId>swagger-annotations</artifactId>
       <version>${swagger-core-version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.kjetland</groupId>
+      <artifactId>mbknor-jackson-jsonschema_2.12</artifactId>
+    </dependency>
 
     <!-- HTTP client: jersey-client -->
     <dependency>

swagger/pom.xml

@@ -71,15 +71,14 @@
     </profiles>
 
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>operator-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.kubernetes</groupId>
+            <artifactId>client-java</artifactId>
+       </dependency>
     </dependencies>
 
 </project>