Merge branch 'gt-health:master' into master

nightingaleproject · Aug 26, 2021 · a1f9101 · a1f9101
2 parents a981c37 + 5d76b76
commit a1f9101
Show file tree

Hide file tree

Showing 93 changed files with 2,515 additions and 875 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>edu.gatech</groupId>
   <artifactId>VRDR</artifactId>
-  <version>v0.1.1-STUBallot1-REVISED.1</version>
+  <version>v1.0.4-R4</version>
   <packaging>jar</packaging>
 
   <name>VRDR</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>4.13.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -36,12 +36,7 @@
     </dependency>
     <dependency>
     	<groupId>ca.uhn.hapi.fhir</groupId>
-    	<artifactId>hapi-fhir-structures-dstu2</artifactId>
-    	<version>${fhir.version}</version>
-    </dependency>
-    <dependency>
-    	<groupId>ca.uhn.hapi.fhir</groupId>
-    	<artifactId>hapi-fhir-structures-dstu3</artifactId>
+    	<artifactId>hapi-fhir-structures-r4</artifactId>
     	<version>${fhir.version}</version>
     </dependency>
     <dependency>
@@ -51,7 +46,7 @@
     </dependency>
     <dependency>
     	<groupId>ca.uhn.hapi.fhir</groupId>
-    	<artifactId>hapi-fhir-validation-resources-dstu3</artifactId>
+    	<artifactId>hapi-fhir-validation-resources-r4</artifactId>
     	<version>${fhir.version}</version>
     </dependency>
   </dependencies>

diff --git a/src/main/java/edu/gatech/VRDR/model/DeathCertificateDocument.java b/src/main/java/edu/gatech/VRDR/model/DeathCertificateDocument.java
diff --git a/src/main/java/edu/gatech/VRDR/model/DeathCertification.java b/src/main/java/edu/gatech/VRDR/model/DeathCertification.java
diff --git a/src/main/java/edu/gatech/VRDR/model/DecedentEducationLevel.java b/src/main/java/edu/gatech/VRDR/model/DecedentEducationLevel.java
diff --git a/src/main/java/edu/gatech/VRDR/model/DecedentEmploymentHistory.java b/src/main/java/edu/gatech/VRDR/model/DecedentEmploymentHistory.java
diff --git a/src/main/java/edu/gatech/VRDR/model/DecedentTransportationRole.java b/src/main/java/edu/gatech/VRDR/model/DecedentTransportationRole.java
diff --git a/src/main/java/edu/gatech/VRDR/model/ExaminerContacted.java b/src/main/java/edu/gatech/VRDR/model/ExaminerContacted.java
diff --git a/src/main/java/edu/gatech/VRDR/model/FuneralServiceLicensee.java b/src/main/java/edu/gatech/VRDR/model/FuneralServiceLicensee.java
diff --git a/src/main/java/edu/gatech/VRDR/model/InjuryIncident.java b/src/main/java/edu/gatech/VRDR/model/InjuryIncident.java
diff --git a/src/main/java/edu/gatech/VRDR/model/InjuryLocation.java b/src/main/java/edu/gatech/VRDR/model/InjuryLocation.java
diff --git a/src/main/java/edu/gatech/VRDR/model/MannerOfDeath.java b/src/main/java/edu/gatech/VRDR/model/MannerOfDeath.java
diff --git a/src/main/java/edu/gatech/VRDR/model/util/AutopsyPerformedIdentifierUtil.java b/src/main/java/edu/gatech/VRDR/model/util/AutopsyPerformedIdentifierUtil.java
diff --git a/src/main/java/edu/gatech/VRDR/model/util/BirthRecordIdentifierUtil.java b/src/main/java/edu/gatech/VRDR/model/util/BirthRecordIdentifierUtil.java
diff --git a/src/main/java/edu/gatech/VRDR/model/util/DeathCertificateReferenceUtil.java b/src/main/java/edu/gatech/VRDR/model/util/DeathCertificateReferenceUtil.java
diff --git a/src/main/java/edu/gatech/VRDR/model/util/DeathCertificateUtil.java b/src/main/java/edu/gatech/VRDR/model/util/DeathCertificateUtil.java