Merge changes from patch branch back to main.

This commit is contained in:
Michael Jumper committed 2024-06-11 11:19:52 -07:00
commit 284353da48
31 files changed
+81 -61

No files matched your search

@@ -57,7 +57,7 @@
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>3.5.15</version>
<version>3.5.16</version>
</dependency>
<!-- MyBatis Guice -->
@@ -133,7 +133,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.16.1</version>
<version>1.17.0</version>
</dependency>
</dependencies>
@@ -135,7 +135,7 @@
<!--
Replace slightly older commons-codec (1.15) with newer
and identical version to that used by Apache Directory API
for LDAP (1.16.0) so that we don't need two copies of the
for LDAP (1.17.0) so that we don't need two copies of the
same license information.
-->
<exclusion>
@@ -157,7 +157,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.16.1</version>
<version>1.17.0</version>
</dependency>
</dependencies>
+1 -1
View File
@@ -174,7 +174,7 @@
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0</version>
<version>2.1.1</version>
<scope>provided</scope>
</dependency>
@@ -60,7 +60,7 @@
<dependency>
<groupId>com.keepersecurity.secrets-manager</groupId>
<artifactId>core</artifactId>
<version>16.6.3</version>
<version>16.6.4</version>
<!-- Correct version conflict (different versions across transitive
dependencies) -->
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bc-fips</artifactId>
<version>1.0.2.4</version>
<version>1.0.2.5</version>
</dependency>
</dependencies>