Merge 1.5.4 changes back to master.

This commit is contained in:
James Muehlner
2023-12-04 17:23:53 +00:00
66 changed files with 176 additions and 83 deletions

View File

@@ -51,8 +51,19 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-all</artifactId>
<version>2.1.4</version>
<version>2.1.5</version>
<exclusions>
<!--
Replace slightly older commons-lang3 (3.13.0) with latest
compatible version (3.14.0) so that we don't need two copies
of the same license information.
-->
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -72,6 +83,13 @@
<artifactId>jackson-dataformat-yaml</artifactId>
</dependency>
<!-- Apache Commons Lang (see exclusions for api-all) -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
</dependency>
</dependencies>
</project>