From 9808ce925f90b70dfe62e0a604e9e2bcd65b397f Mon Sep 17 00:00:00 2001
From: Ryan Eberhard <ryan.eberhard@oracle.com>
Date: Tue, 3 Aug 2021 15:37:45 -0400
Subject: [PATCH] Update dependency check for Kotlin

---
 .../dependency-check-suppression.xml          |  8 +++++++
 operator/pom.xml                              | 11 ++++++++++
 pom.xml                                       | 21 +++++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/build-tools/dependency-check/dependency-check-suppression.xml b/build-tools/dependency-check/dependency-check-suppression.xml
index 97ca4018c8e..2e5f6e24246 100644
--- a/build-tools/dependency-check/dependency-check-suppression.xml
+++ b/build-tools/dependency-check/dependency-check-suppression.xml
@@ -8,6 +8,10 @@
         <packageUrl regex="true">^pkg:maven/io\.kubernetes/client\-java\-api@.*$</packageUrl>
         <cpe>cpe:/a:kubernetes:kubernetes</cpe>
     </suppress>
+    <suppress>
+        <packageUrl regex="true">^pkg:maven/io\.kubernetes/client\-java\-api\-fluent@.*$</packageUrl>
+        <cpe>cpe:/a:kubernetes:kubernetes</cpe>
+    </suppress>
     <suppress>
         <packageUrl regex="true">^pkg:maven/io\.kubernetes/client\-java\-proto@.*$</packageUrl>
         <cpe>cpe:/a:kubernetes:kubernetes</cpe>
@@ -16,6 +20,10 @@
         <packageUrl regex="true">^pkg:maven/oracle\.kubernetes/weblogic\-kubernetes\-operator@.*$</packageUrl>
         <cpe>cpe:/a:kubernetes:kubernetes</cpe>
     </suppress>
+    <suppress>
+        <packageUrl regex="true">^pkg:maven/oracle\.kubernetes/operator\-swagger@.*$</packageUrl>
+        <cpe>cpe:/a:kubernetes:kubernetes</cpe>
+    </suppress>
     <suppress>
         <packageUrl regex="true">^pkg:maven/oracle\.kubernetes/integration\-tests@.*$</packageUrl>
         <cpe>cpe:/a:kubernetes:kubernetes</cpe>
diff --git a/operator/pom.xml b/operator/pom.xml
index 53a0a9f6bf5..9860fce04a9 100644
--- a/operator/pom.xml
+++ b/operator/pom.xml
@@ -109,6 +109,7 @@
               <includeScope>runtime</includeScope>
               <outputDirectory>${project.build.directory}/lib</outputDirectory>
               <excludeGroupIds>io.prometheus,com.google.protobuf</excludeGroupIds>
+              <excludeArtifactIds>kotlin-stdlib-jdk7,kotlin-stdlib-jdk8</excludeArtifactIds>
             </configuration>
           </execution>
         </executions>
@@ -335,6 +336,16 @@
       <artifactId>client-java-api-fluent</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-common</artifactId>
+    </dependency>
+
     <!-- test dependencies -->
     <dependency>
       <groupId>com.appscode.voyager</groupId>
diff --git a/pom.xml b/pom.xml
index 5292df3694f..0a864e6fee1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -440,6 +440,26 @@
         <artifactId>client-java-api-fluent</artifactId>
         <version>${client-java-version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-stdlib</artifactId>
+        <version>${kotlin-stdlib-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-stdlib-common</artifactId>
+        <version>${kotlin-stdlib-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-stdlib-jdk7</artifactId>
+        <version>${kotlin-stdlib-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-stdlib-jdk8</artifactId>
+        <version>${kotlin-stdlib-version}</version>
+      </dependency>
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest-junit</artifactId>
@@ -618,6 +638,7 @@
     <commons.io.version>2.11.0</commons.io.version>
     <awaitility-version>4.1.0</awaitility-version>
     <client-java-version>13.0.0</client-java-version>
+    <kotlin-stdlib-version>1.5.21</kotlin-stdlib-version>
     <junit.jupiter.version>5.7.2</junit.jupiter.version>
     <junit.vintage.version>5.7.1</junit.vintage.version>
     <junit.platform.version>1.7.0</junit.platform.version>