From 383e2d053adfb70c81db4274c9cacd9b2aaf70d0 Mon Sep 17 00:00:00 2001
From: Brian Harris <sendbrianemail@gmail.com>
Date: Wed, 30 Nov 2016 14:06:51 -0500
Subject: [PATCH 1/6] updating poms for 1.0.9-SNAPSHOT development

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7f790584..908f691e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.sitenv</groupId>
     <artifactId>referenceccdavalidator</artifactId>
-    <version>1.0.8-SNAPSHOT</version>
+    <version>1.0.9-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>Reference CCDA Validator</name>
 

From bf14b013ae391fe2c53aac79f6a45e482929bac2 Mon Sep 17 00:00:00 2001
From: Brian Harris <sendbrianemail@gmail.com>
Date: Wed, 30 Nov 2016 14:07:32 -0500
Subject: [PATCH 2/6] updating develop poms to master versions to avoid merge
 conflicts

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 908f691e..0ddb9ac5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.sitenv</groupId>
     <artifactId>referenceccdavalidator</artifactId>
-    <version>1.0.9-SNAPSHOT</version>
+    <version>1.0.8</version>
     <packaging>war</packaging>
     <name>Reference CCDA Validator</name>
 

From 00c4eb626d5539cd33537a69db50730fa79c3b05 Mon Sep 17 00:00:00 2001
From: Brian Harris <sendbrianemail@gmail.com>
Date: Wed, 30 Nov 2016 14:07:33 -0500
Subject: [PATCH 3/6] Updating develop poms back to pre merge state

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0ddb9ac5..908f691e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.sitenv</groupId>
     <artifactId>referenceccdavalidator</artifactId>
-    <version>1.0.8</version>
+    <version>1.0.9-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>Reference CCDA Validator</name>
 

From 77d477b0682d6859d3028e1668b2521da1ac9743 Mon Sep 17 00:00:00 2001
From: Brian Harris <sendbrianemail@gmail.com>
Date: Mon, 5 Dec 2016 15:34:51 -0500
Subject: [PATCH 4/6] updated validator config to use
 2.16.840.1.113883.3.88.12.3221.8.11 in
 substanceAdministration(2.16.840.1.113883.10.20.22.4.16)

---
 configuration/ccdaReferenceValidatorConfig.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configuration/ccdaReferenceValidatorConfig.xml b/configuration/ccdaReferenceValidatorConfig.xml
index 98ca39ac..4fb98418 100644
--- a/configuration/ccdaReferenceValidatorConfig.xml
+++ b/configuration/ccdaReferenceValidatorConfig.xml
@@ -995,14 +995,14 @@
 		</validator>
 	</expression>
 
-	<!--15. MAY contain zero or one [0..1] administrationUnitCode, which SHALL be selected from ValueSet Medication Product Form Value Set urn:oid:2.16.840.1.113883.3.88.12.3221.8.11 DYNAMIC (CONF:1098-7519).-->
+	<!--15. MAY contain zero or one [0..1] administrationUnitCode, which SHALL be selected from ValueSet AdministrationUnitDoseForm urn:oid:2.16.840.1.113762.1.4.1021.30 DYNAMIC (CONF:1098-7519).-->
 	<expression xpathExpression="//v3:substanceAdministration/v3:templateId[@root='2.16.840.1.113883.10.20.22.4.16' and @extension='2014-06-09']/ancestor::v3:substanceAdministration[1]/v3:administrationUnitCode[not(@nullFlavor) and ancestor::v3:section[not(@nullFlavor)]]">
 		<validator>
 			<name>ValueSetCodeValidator</name>
 			<validationResultSeverityLevels>
 				<codeSeverityLevel>SHALL</codeSeverityLevel>
 			</validationResultSeverityLevels>
-			<allowedValuesetOids>2.16.840.1.113883.3.88.12.3221.8.11</allowedValuesetOids>
+			<allowedValuesetOids>2.16.840.1.113762.1.4.1021.30</allowedValuesetOids>
 		</validator>
 	</expression>
 	<!-- MEDICATION ACTIVITY END -->

From 83098ae7a319ea44c0a4660b995ca7fbb90659a6 Mon Sep 17 00:00:00 2001
From: Brian Harris <sendbrianemail@gmail.com>
Date: Mon, 5 Dec 2016 16:28:46 -0500
Subject: [PATCH 5/6] updated content validator to 1.0.6

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 908f691e..7521d6a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
         <dependency>
             <groupId>org.sitenv</groupId>
             <artifactId>contentvalidator-api</artifactId>
-            <version>1.0.5</version>
+            <version>1.0.6</version>
         </dependency>
         <!-- END CONTENT DEPENDENCIES -->
 

From e6b09044dfbbc50a3646369d2c214e7200cf7ed0 Mon Sep 17 00:00:00 2001
From: Brian Harris <sendbrianemail@gmail.com>
Date: Mon, 5 Dec 2016 16:30:00 -0500
Subject: [PATCH 6/6] updating poms for branch'release/1.0.9' with non-snapshot
 versions

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7521d6a1..36cae52d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.sitenv</groupId>
     <artifactId>referenceccdavalidator</artifactId>
-    <version>1.0.9-SNAPSHOT</version>
+    <version>1.0.9</version>
     <packaging>war</packaging>
     <name>Reference CCDA Validator</name>