Merge 1.4.0 changes back to master.

This commit is contained in:
Virtually Nick
2021-12-27 09:32:39 -05:00
120 changed files with 2853 additions and 715 deletions

View File

@@ -51,7 +51,21 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-all</artifactId>
<version>2.0.1</version>
<version>2.1.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Override version of Apache Mina specified by Apache Directory API
with latest compatible version -->
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
<version>2.1.5</version>
</dependency>
<!-- Guice -->