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

12
pom.xml
View File

@@ -36,15 +36,15 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Dependency versions -->
<guava.version>30.1.1-jre</guava.version>
<guava.version>31.0.1-jre</guava.version>
<guice.version>5.0.1</guice.version>
<hk2.version>2.6.1</hk2.version>
<jackson.version>2.12.2</jackson.version>
<jersey.version>2.34</jersey.version>
<junit.version>5.7.1</junit.version>
<jackson.version>2.13.1</jackson.version>
<jersey.version>2.35</jersey.version>
<junit.version>5.8.2</junit.version>
<junit4.version>4.13.2</junit4.version>
<logback.version>1.2.3</logback.version>
<slf4j.version>1.7.30</slf4j.version>
<logback.version>1.2.10</logback.version>
<slf4j.version>1.7.32</slf4j.version>
<!-- The directory that should receive all generated dependency lists
(for LICENSE generation) -->