Merge patch branch changes to main

This commit is contained in:
Virtually Nick
2024-09-25 12:48:14 -04:00
9 changed files with 7 additions and 7 deletions

View File

@@ -1,2 +0,0 @@
org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:jar:1.6.3
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:jar:1.6.3

View File

@@ -1,7 +1,7 @@
Kotlin Serialization (https://github.com/Kotlin/kotlinx.serialization) Kotlin Serialization (https://github.com/Kotlin/kotlinx.serialization)
---------------------------------------------------------------------- ----------------------------------------------------------------------
Version: 1.6.3 Version: 1.7.2
From: 'JetBrains s.r.o and respective authors and developers' From: 'JetBrains s.r.o and respective authors and developers'
License(s): License(s):
Apache v2.0 Apache v2.0

View File

@@ -0,0 +1,2 @@
org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:jar:1.7.2
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:jar:1.7.2

View File

@@ -1 +0,0 @@
com.keepersecurity.secrets-manager:core:jar:16.6.4

View File

@@ -2,8 +2,8 @@ Keeper Secrets Manager Java SDK
(https://github.com/Keeper-Security/secrets-manager) (https://github.com/Keeper-Security/secrets-manager)
---------------------------------------------------- ----------------------------------------------------
Version: 16.6.4 Version: 16.6.5
From: 'Keeper Security' (https://www.keepersecurity.com/) From: 'Keeper Security' (https://www.keepersecurity.com/)
License(s): License(s):
MIT (bundled/ksm-sdk-16.6.4/LICENSE) MIT (bundled/ksm-sdk-16.6.5/LICENSE)

View File

@@ -0,0 +1 @@
com.keepersecurity.secrets-manager:core:jar:16.6.5

View File

@@ -60,7 +60,7 @@
<dependency> <dependency>
<groupId>com.keepersecurity.secrets-manager</groupId> <groupId>com.keepersecurity.secrets-manager</groupId>
<artifactId>core</artifactId> <artifactId>core</artifactId>
<version>16.6.4</version> <version>16.6.5</version>
<!-- Correct version conflict (different versions across transitive <!-- Correct version conflict (different versions across transitive
dependencies) --> dependencies) -->