Merged the rel_5_3_0 branch into this Branch to pick up the MDM changes.

This commit is contained in:
Kevin Dougan
2021-01-07 09:12:52 -05:00
parent a83927aa0c
commit 3954f6a3f4
18 changed files with 338 additions and 262 deletions

23
pom.xml
View File

@@ -22,7 +22,6 @@
<properties>
<java.version>8</java.version>
<spring_boot_version>2.3.4.RELEASE</spring_boot_version>
</properties>
<prerequisites>
@@ -107,6 +106,12 @@
<artifactId>hapi-fhir-jpaserver-cql</artifactId>
<version>${project.version}</version>
</dependency>
<!-- This dependency includes the JPA MDM Server -->
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-jpaserver-mdm</artifactId>
<version>${project.version}</version>
</dependency>
<!-- This dependency is used for the "FHIR Tester" web app overlay -->
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
@@ -235,6 +240,21 @@
<artifactId>jetty-webapp</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>elasticsearch</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<!--
@@ -358,7 +378,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M5</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>