Merge pull request #142 from onc-healthit/seanR3155

Merge MDHT changes into develop for SITE R3.1.55
onc-healthit · Jan 28, 2022 · 85b31d5 · 85b31d5
2 parents cc5f265 + def12da
commit 85b31d5
Show file tree

Hide file tree

Showing 4 changed files with 1,697 additions and 1,269 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,10 +14,23 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <code.validator.version>latestVersion</code.validator.version>
         <content.validator.version>latestVersion</content.validator.version>
-        <!-- MDHT properties -->
-     	<mdht.models.version>3.0.0.20212117</mdht.models.version>
-	<ds4pcontent.version>${mdht.models.version}</ds4pcontent.version>
-	<mdht.plugins.version>3.0.0.202112170600</mdht.plugins.version>
+        <!-- MDHT SITE properties -->
+        <mdht.models.groupid>mdht.openhealthtools.mdht.cda</mdht.models.groupid>
+        <mdht.models.version>3.0.0.20220126</mdht.models.version>
+        <ds4pcontent.groupId>mdht.hl7.ds4p</ds4pcontent.groupId>
+		<ds4pcontent.version>${mdht.models.version}</ds4pcontent.version>		
+		<mdht.plugins.groupId>mdht.eclipse.mdht</mdht.plugins.groupId>
+		<mdht.plugins.version>3.0.0.202201250600</mdht.plugins.version>
+
+ 		<!-- MDHT SNAPSHOT properties: Uncomment for local test -->
+ 		<!--
+		<mdht.models.groupid>org.openhealthtools.mdht.cda</mdht.models.groupid>
+		<mdht.models.version>3.0.0-SNAPSHOT</mdht.models.version>		
+		<ds4pcontent.groupId>org.hl7.security.ds4p</ds4pcontent.groupId>
+		<ds4pcontent.version>${mdht.models.version}</ds4pcontent.version>		
+		<mdht.plugins.groupId>org.eclipse.mdht</mdht.plugins.groupId>
+		<mdht.plugins.version>3.0.0-SNAPSHOT</mdht.plugins.version>
+		-->
     </properties>
 
     <repositories>
@@ -35,38 +48,38 @@
         <!-- START MDHT DEPENDENCIES - from AHRQ DEV CCDA artifactory -->
 		<!-- 1st party MDHT - MODELS from https://github.com/mdht/mdht-models -->
         <dependency>
-            <groupId>mdht.openhealthtools.mdht.cda</groupId>
+            <groupId>${mdht.models.groupid}</groupId>
             <artifactId>org.openhealthtools.mdht.uml.cda.consol2</artifactId>
             <version>${mdht.models.version}</version>
         </dependency>
 		<dependency>
-		    <groupId>mdht.openhealthtools.mdht.cda</groupId>
+		    <groupId>${mdht.models.groupid}</groupId>
 		    <artifactId>org.openhealthtools.mdht.uml.cda.mu2consol</artifactId>
 		    <version>${mdht.models.version}</version>
         </dependency>
         <dependency>
-            <groupId>mdht.hl7.ds4p</groupId>
+            <groupId>${ds4pcontent.groupId}</groupId>
             <artifactId>org.hl7.security.ds4p.contentprofile</artifactId>
             <version>${ds4pcontent.version}</version>
         </dependency> 
 		<!-- 1st party MDHT - PLUGINS from http://git.eclipse.org/c/mdht/org.eclipse.mdht.git -->
 		<dependency>
-            <groupId>mdht.eclipse.mdht</groupId>
+            <groupId>${mdht.plugins.groupId}</groupId>
             <artifactId>org.eclipse.mdht.emf.runtime</artifactId>
 		    <version>${mdht.plugins.version}</version>
 		</dependency>
         <dependency>
-            <groupId>mdht.eclipse.mdht</groupId>
+            <groupId>${mdht.plugins.groupId}</groupId>
             <artifactId>org.eclipse.mdht.uml.cda</artifactId>
             <version>${mdht.plugins.version}</version>
         </dependency>
 		<dependency>
-            <groupId>mdht.eclipse.mdht</groupId>
+            <groupId>${mdht.plugins.groupId}</groupId>
             <artifactId>org.eclipse.mdht.uml.hl7.datatypes</artifactId>
 		    <version>${mdht.plugins.version}</version>
 		</dependency>
 		<dependency>
-            <groupId>mdht.eclipse.mdht</groupId>
+            <groupId>${mdht.plugins.groupId}</groupId>
             <artifactId>org.eclipse.mdht.uml.hl7.rim</artifactId>
 		    <version>${mdht.plugins.version}</version>
 		</dependency>