Updates to models and tests

mdht · Jun 17, 2020 · 306c6b7 · 306c6b7
1 parent d29b88b
commit 306c6b7
Show file tree

Hide file tree

Showing 26 changed files with 63,961 additions and 16 deletions.
diff --git a/generated/org.openhealthtools.mdht.uml.cda.cdt/META-INF/MANIFEST.MF b/generated/org.openhealthtools.mdht.uml.cda.cdt/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@ Bundle-ClassPath: .
 Bundle-Activator: org.openhealthtools.mdht.uml.cda.cdt.CDTPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,

diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/META-INF/MANIFEST.MF b/generated/org.openhealthtools.mdht.uml.cda.consol2/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 3.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,

diff --git a/generated/org.openhealthtools.mdht.uml.cda.hitsp/META-INF/MANIFEST.MF b/generated/org.openhealthtools.mdht.uml.cda.hitsp/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 3.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: org.openhealthtools.mdht.uml.cda.hitsp,
  org.openhealthtools.mdht.uml.cda.hitsp.impl,
  org.openhealthtools.mdht.uml.cda.hitsp.operations,

diff --git a/generated/org.openhealthtools.mdht.uml.cda.ihe/META-INF/MANIFEST.MF b/generated/org.openhealthtools.mdht.uml.cda.ihe/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 3.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: org.openhealthtools.mdht.uml.cda.ihe,
  org.openhealthtools.mdht.uml.cda.ihe.impl,
  org.openhealthtools.mdht.uml.cda.ihe.operations,

diff --git a/generated/org.openhealthtools.mdht.uml.cda.mu2consol/META-INF/MANIFEST.MF b/generated/org.openhealthtools.mdht.uml.cda.mu2consol/META-INF/MANIFEST.MF
@@ -1,7 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Version: 3.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.openhealthtools.mdht.uml.cda.mu2consol;singleton:=true
 Bundle-ActivationPolicy: lazy

diff --git a/pom.xml b/pom.xml
@@ -9,8 +9,8 @@
 
 	<properties>
 
-		<tycho-version>1.0.0</tycho-version>
-		<tychoExtrasVersion>1.0.0</tychoExtrasVersion>
+		<tycho-version>1.7.0</tycho-version>
+		<tychoExtrasVersion>1.7.0</tychoExtrasVersion>
 		<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/mdht/org.eclipse.mdht</tycho.scmUrl>
 		<jarSignerVersion>1.1.2</jarSignerVersion>
 		<findbugs.version>3.0.1</findbugs.version>

diff --git a/tests/org.hl7.security.ds4p.contentprofile.tests/samples/NEWcdaPrivacySegmentedDocument.xml b/tests/org.hl7.security.ds4p.contentprofile.tests/samples/NEWcdaPrivacySegmentedDocument.xml
@@ -406,7 +406,7 @@
 										codeSystem="2.16.840.1.113883.5.1063"
 										codeSystemName="SecurityObservationValueCodeSystem"
 										displayName="Encrypt information">
-										<originalText>Information must be encrypted</originalText>
+										<originalText></originalText>
 									</value>
 								</observation>
 							</component>
@@ -721,7 +721,7 @@
                                        <code code="SECCONOBS" codeSystem="2.16.840.1.113883.1.11.20457" displayName="Security Classification" codeSystemName="HL7 SecurityObservationTypeCodeSystem" />
                                        <!-- Value set constraint "2.16.840.1.113883.1.11.20445" -->
                                        <value xsi:type="CE" code="ENCRYPT" codeSystem="2.16.840.1.113883.5.1063" codeSystemName="SecurityObservationValueCodeSystem" displayName="Encrypt information">
-                                          <originalText>Information must be encrypted</originalText>
+                                          <originalText></originalText>
                                        </value>
                                     </observation>
                                  </component>