Skip to content

Commit 00deb88

Browse files
authored
Update dependency check for Kotlin (#2489)
1 parent ad23108 commit 00deb88

File tree

3 files changed

+40
-0
lines changed

3 files changed

+40
-0
lines changed

build-tools/dependency-check/dependency-check-suppression.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
<packageUrl regex="true">^pkg:maven/io\.kubernetes/client\-java\-api@.*$</packageUrl>
99
<cpe>cpe:/a:kubernetes:kubernetes</cpe>
1010
</suppress>
11+
<suppress>
12+
<packageUrl regex="true">^pkg:maven/io\.kubernetes/client\-java\-api\-fluent@.*$</packageUrl>
13+
<cpe>cpe:/a:kubernetes:kubernetes</cpe>
14+
</suppress>
1115
<suppress>
1216
<packageUrl regex="true">^pkg:maven/io\.kubernetes/client\-java\-proto@.*$</packageUrl>
1317
<cpe>cpe:/a:kubernetes:kubernetes</cpe>
@@ -16,6 +20,10 @@
1620
<packageUrl regex="true">^pkg:maven/oracle\.kubernetes/weblogic\-kubernetes\-operator@.*$</packageUrl>
1721
<cpe>cpe:/a:kubernetes:kubernetes</cpe>
1822
</suppress>
23+
<suppress>
24+
<packageUrl regex="true">^pkg:maven/oracle\.kubernetes/operator\-swagger@.*$</packageUrl>
25+
<cpe>cpe:/a:kubernetes:kubernetes</cpe>
26+
</suppress>
1927
<suppress>
2028
<packageUrl regex="true">^pkg:maven/oracle\.kubernetes/integration\-tests@.*$</packageUrl>
2129
<cpe>cpe:/a:kubernetes:kubernetes</cpe>

operator/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
<includeScope>runtime</includeScope>
110110
<outputDirectory>${project.build.directory}/lib</outputDirectory>
111111
<excludeGroupIds>io.prometheus,com.google.protobuf</excludeGroupIds>
112+
<excludeArtifactIds>kotlin-stdlib-jdk7,kotlin-stdlib-jdk8</excludeArtifactIds>
112113
</configuration>
113114
</execution>
114115
</executions>
@@ -335,6 +336,16 @@
335336
<artifactId>client-java-api-fluent</artifactId>
336337
</dependency>
337338

339+
<dependency>
340+
<groupId>org.jetbrains.kotlin</groupId>
341+
<artifactId>kotlin-stdlib</artifactId>
342+
</dependency>
343+
344+
<dependency>
345+
<groupId>org.jetbrains.kotlin</groupId>
346+
<artifactId>kotlin-stdlib-common</artifactId>
347+
</dependency>
348+
338349
<!-- test dependencies -->
339350
<dependency>
340351
<groupId>com.appscode.voyager</groupId>

pom.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,26 @@
440440
<artifactId>client-java-api-fluent</artifactId>
441441
<version>${client-java-version}</version>
442442
</dependency>
443+
<dependency>
444+
<groupId>org.jetbrains.kotlin</groupId>
445+
<artifactId>kotlin-stdlib</artifactId>
446+
<version>${kotlin-stdlib-version}</version>
447+
</dependency>
448+
<dependency>
449+
<groupId>org.jetbrains.kotlin</groupId>
450+
<artifactId>kotlin-stdlib-common</artifactId>
451+
<version>${kotlin-stdlib-version}</version>
452+
</dependency>
453+
<dependency>
454+
<groupId>org.jetbrains.kotlin</groupId>
455+
<artifactId>kotlin-stdlib-jdk7</artifactId>
456+
<version>${kotlin-stdlib-version}</version>
457+
</dependency>
458+
<dependency>
459+
<groupId>org.jetbrains.kotlin</groupId>
460+
<artifactId>kotlin-stdlib-jdk8</artifactId>
461+
<version>${kotlin-stdlib-version}</version>
462+
</dependency>
443463
<dependency>
444464
<groupId>org.hamcrest</groupId>
445465
<artifactId>hamcrest-junit</artifactId>
@@ -618,6 +638,7 @@
618638
<commons.io.version>2.11.0</commons.io.version>
619639
<awaitility-version>4.1.0</awaitility-version>
620640
<client-java-version>13.0.0</client-java-version>
641+
<kotlin-stdlib-version>1.5.21</kotlin-stdlib-version>
621642
<junit.jupiter.version>5.7.2</junit.jupiter.version>
622643
<junit.vintage.version>5.7.1</junit.vintage.version>
623644
<junit.platform.version>1.7.0</junit.platform.version>

0 commit comments

Comments
 (0)