- Kotlin from 2.0.21 to 2.1.0

apache · Nov 28, 2024 · ad22f9e · ad22f9e
1 parent 54aaf63
commit ad22f9e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/nifi-extension-bundles/nifi-aws-bundle/pom.xml b/nifi-extension-bundles/nifi-aws-bundle/pom.xml
@@ -72,6 +72,13 @@
                 <artifactId>protobuf-java</artifactId>
                 <version>3.25.5</version>
             </dependency>
+            <!-- Override kotlin-stdlib-common from amazon-kinesis-client -->
+            <!-- can be removed when not relying on kotlin-stdlib-common:jar anymore -->
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-stdlib-common</artifactId>
+                <version>2.0.21</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/nifi-extension-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml b/nifi-extension-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml
@@ -302,10 +302,6 @@
             <groupId>com.squareup.okio</groupId>
             <artifactId>okio-jvm</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-common</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib</artifactId>

diff --git a/nifi-extension-bundles/nifi-standard-shared-bundle/nifi-standard-shared-nar/pom.xml b/nifi-extension-bundles/nifi-standard-shared-bundle/nifi-standard-shared-nar/pom.xml
@@ -128,11 +128,6 @@
             <artifactId>okio-jvm</artifactId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-common</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -113,7 +113,7 @@
         <software.amazon.awssdk.version>2.29.22</software.amazon.awssdk.version>
         <gson.version>2.11.0</gson.version>
         <io.fabric8.kubernetes.client.version>6.13.4</io.fabric8.kubernetes.client.version>
-        <kotlin.version>2.0.21</kotlin.version>
+        <kotlin.version>2.1.0</kotlin.version>
         <okhttp.version>4.12.0</okhttp.version>
         <okio.version>3.9.1</okio.version>
         <org.apache.commons.cli.version>1.9.0</org.apache.commons.cli.version>