Merge branch 'master' into rel_4_1_0

2019-11-12 22:37:34 -05:00
parent 07852800b1 ad4e684c91
commit a47c814fc6
13 changed files with 731 additions and 319 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,11 @@
    </parent>

    <artifactId>hapi-fhir-jpaserver-starter</artifactId>
+
+    <prerequisites>
+        <maven>3.5.0</maven>
+    </prerequisites>
+
    <dependencies>
        <dependency>
            <groupId>org.eclipse.jetty.websocket</groupId>
@@ -29,7 +34,7 @@
        <dependency>
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
-            <version>6.0.5</version>
+            <version>8.0.11</version>
        </dependency>

        <!-- Needed for Email subscriptions -->
@@ -208,7 +213,7 @@
            <groupId>org.eclipse.jetty</groupId>
            <artifactId>jetty-webapp</artifactId>
            <scope>test</scope>
-        </dependency>
+			</dependency>
 			<!--
        <dependency>
            <groupId>com.helger</groupId>