Merge branch 'develop'

2018-09-14 23:08:50 -07:00
parent 8db908912c 71e99673e4
commit 45ccacad39
95 changed files with 304 additions and 269 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.5</version>
+                    <version>2.10</version>
                </plugin>
                <plugin>
                    <groupId>org.jvnet.jaxb2.maven2</groupId>