Merge branch 'develop' into 'master'

Develop See merge request !14

Merge branch 'develop' into 'master'
Develop See merge request !14
e37d9a72 · Achraf Achkari · 34b54a34 · 474b3915 · e37d9a72 · e37d9a72
Commit e37d9a72 authored 2 years ago by Achraf Achkari
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
 # Define templates
 include:
  - project: 'gazelle/private/gitlab-ci-templates'
-    file: 'extends.yaml'
-    ref: 'master'
+    file: 'extends-v2.yaml'
+    ref: '1.0.0'

 # Define stages
 stages:
  - build
-  - postbuild
+  - predeploy
  - deploy
-  - tests
+  - test
+  - publish
  - release
  - upgrade
  - cleanup

 # Define global variables
 variables:
-  P_NAME: "uml-models"
-  P_APP_TYPE: "java"
-  P_CODE_SRC_PATH: "."
  P_MAVEN_IMAGE_TAG: "3.6.3-jdk-11-slim"

-# Define jobs
-code:
+compile/unit-test:
  stage: build
  extends:
-    - .buildCodeForJavaWithPostgresql
+    - .buildJavaMavenTest
  variables:
-    P_MAVEN_EXTRA_ARGS: "-DskipIT=true"
+    P_MAVEN_EXTRA_ARGS: "-DskipITs"

-quality:
-  stage: tests
+
+package:
+  stage: build
  extends:
-    - .testQualityForJavaWithSonarqube
+    - .buildJavaMavenPackage
  variables:
-    P_MAVEN_IMAGE_TAG: "3.6.3-jdk-11"
+    P_MAVEN_EXTRA_ARGS: "-DskipTests"
+  needs:
+    - job: compile/unit-test
+      artifacts: true
+
+install-cache-repo:
+  stage: publish
+  extends:
+    - .publishJavaMavenInstall
+  variables:
+    P_MAVEN_EXTRA_ARGS: "-DskipTests "
+  needs:
+    - job: package
+      artifacts: true
+
+publish-code:
+  stage: publish
+  extends:
+    - .publishJavaMavenDeploy
+  needs:
+    - job: package
+      artifacts: true

 release/code:
  stage: release
  extends:
    - .releaseCodeForJava
+  when: manual
  variables:
-    P_MAVEN_EXTRA_ARGS: "-DskipIT=true"
+    P_MAVEN_JAVADOC_SKIP: "true"
--- a/cdaepsos-model/src/main/java/net/ihe/gazelle/model/CdaepsosModelRetriever.java
+++ b/cdaepsos-model/src/main/java/net/ihe/gazelle/model/CdaepsosModelRetriever.java
@@ -23,6 +23,7 @@ public class CdaepsosModelRetriever extends ModelRetriever {
        Map<String, URL> modelMap = new HashMap<String, URL>();
        modelMap.put("cda.uml", getClass().getResource("/modelad2/cda.uml"));
        modelMap.put("medication.uml", getClass().getResource("/modelad2/medication.uml"));
+        modelMap.put("pharm.uml", getClass().getResource("/modelad2/pharm.uml"));

        VocModelRetriever vocModelRetriever = new VocModelRetriever();
        Map<String, URL> vocModelMap = vocModelRetriever.retrieveModels();

--- a/cdaepsos-model/src/main/resources/cdaepsos/modelsDefinition.xml
+++ b/cdaepsos-model/src/main/resources/cdaepsos/modelsDefinition.xml
@@ -17,6 +17,11 @@
 		    <path>/path/to/model/cdaepsos-model/modelad2/medication.uml</path>
 		    <relativeXMIPath>../../cdaepsos-model/modelad2/medication.uml</relativeXMIPath>
 		</modelUMLDesc>
+		<modelUMLDesc>
+			<identifier>pharm</identifier>
+			<path>/path/to/model/cdaepsos-model/modelad2/pharm.uml</path>
+			<relativeXMIPath>../../cdaepsos-model/modelad2/pharm.uml</relativeXMIPath>
+		</modelUMLDesc>
 		<modelUMLDesc>
 		    <identifier>nblock</identifier>
 		    <path>/path/to/model/nblock-model/models/nblock.uml</path>

--- a/cdaepsos-model/src/main/resources/modelad2/cda.uml
+++ b/cdaepsos-model/src/main/resources/modelad2/cda.uml
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:TemplateDefiner="http:///schemas/TemplateDefiner/_U4M70NTJEeGhM9ABogTsfg/28" xmlns:TemplateDefiner_1="http:///schemas/TemplateDefiner/_RyoisEqhEeKYlo0bjHdefA/37" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA http:///schemas/TemplateDefiner/_U4M70NTJEeGhM9ABogTsfg/28 pathmap://UML_PROFILES/common-profile.uml#_U4Ni4NTJEeGhM9ABogTsfg http:///schemas/TemplateDefiner/_RyoisEqhEeKYlo0bjHdefA/37 pathmap://UML_PROFILES/common-profile.uml#_RyqX4EqhEeKYlo0bjHdefA">
-  <uml:Model xmi:id="_DAHm0K70EeGxJei_o6JmIA" name="cdaepsos3">
+  <uml:Model xmi:id="_DAHm0K70EeGxJei_o6JmIA" name="cdaepsos4">
    <ownedComment xmi:id="_DLODkq70EeGxJei_o6JmIA" annotatedElement="_DAHm0K70EeGxJei_o6JmIA">
      <body>The following types are used internally in data types
 The following types are used for structural RIM attributes</body>
@@ -5922,18 +5922,10 @@ The following types are used for structural RIM attributes</body>
        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_g2gUAevfEeemYNdmj6WL9w" value="1"/>
        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_g2gUAuvfEeemYNdmj6WL9w"/>
      </ownedAttribute>
-      <ownedAttribute xmi:id="_hVZ2gOvfEeemYNdmj6WL9w" name="riskCode" isOrdered="true" aggregation="composite">
-        <type xmi:type="uml:Class" href="medication.uml#_VzUD0c86EeGVX9h3ivlQvw"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hVZ2gevfEeemYNdmj6WL9w" value="1"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hVZ2guvfEeemYNdmj6WL9w"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:id="_hoZrAOvfEeemYNdmj6WL9w" name="handlingCode" isOrdered="true" aggregation="composite">
-        <type xmi:type="uml:Class" href="medication.uml#_VzUD0c86EeGVX9h3ivlQvw"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hoZrAevfEeemYNdmj6WL9w" value="1"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hoZrAuvfEeemYNdmj6WL9w"/>
-      </ownedAttribute>
+
+
      <ownedAttribute xmi:id="_h531gOvfEeemYNdmj6WL9w" name="formCode" isOrdered="true" aggregation="composite">
-        <type xmi:type="uml:Class" href="medication.uml#_VzUD0c86EeGVX9h3ivlQvw"/>
+        <type xmi:type="uml:Class" href="../../datatypes-model/models/datatypes.uml#_CuENlK70EeGxJei_o6JmIA"/>
        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_h531gevfEeemYNdmj6WL9w" value="1"/>
        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_h531guvfEeemYNdmj6WL9w"/>
      </ownedAttribute>
@@ -5942,42 +5934,28 @@ The following types are used for structural RIM attributes</body>
        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DALR8670EeGxJei_o6JmIA"/>
      </ownedAttribute>
      <ownedAttribute xmi:id="_iMt5AOvfEeemYNdmj6WL9w" name="expirationTime" isOrdered="true" aggregation="composite">
-        <type xmi:type="uml:Class" href="medication.uml#_VzUpr886EeGVX9h3ivlQvw"/>
+          <type xmi:type="uml:Class" href="../../datatypes-model/models/datatypes.uml#_CuEOl670EeGxJei_o6JmIA"/>
        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iMt5AevfEeemYNdmj6WL9w" value="1"/>
        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iMt5AuvfEeemYNdmj6WL9w"/>
      </ownedAttribute>
-      <ownedAttribute xmi:id="_2zNb4OvfEeemYNdmj6WL9w" name="stabilityTime" isOrdered="true" aggregation="composite">
-        <type xmi:type="uml:Class" href="medication.uml#_VzUpr886EeGVX9h3ivlQvw"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2zNb4evfEeemYNdmj6WL9w" value="1"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2zNb4uvfEeemYNdmj6WL9w"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:id="_3NhZUOvfEeemYNdmj6WL9w" name="asDistributedProduct" isOrdered="true" aggregation="composite">
-        <type xmi:type="uml:Class" href="medication.uml#_VzVRY886EeGVX9h3ivlQvw"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3NhZUevfEeemYNdmj6WL9w" value="*"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3NhZUuvfEeemYNdmj6WL9w"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:id="_3hDZUOvfEeemYNdmj6WL9w" name="asMedicineManufacturer" isOrdered="true" aggregation="composite">
-        <type xmi:type="uml:Class" href="medication.uml#_VzVSd886EeGVX9h3ivlQvw"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3hDZUevfEeemYNdmj6WL9w" value="*"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3hDZUuvfEeemYNdmj6WL9w"/>
-      </ownedAttribute>
+
      <ownedAttribute xmi:id="_75kcQOvgEeemYNdmj6WL9w" name="asContent" isOrdered="true" aggregation="composite">
-        <type xmi:type="uml:Class" href="medication.uml#_VzVQC886EeGVX9h3ivlQvw"/>
+        <type xmi:type="uml:Class" href="pharm.uml#_VzVQC886EeGVX9h3ivlQvw"/>
        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_75kcQevgEeemYNdmj6WL9w" value="1"/>
        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_75kcQuvgEeemYNdmj6WL9w"/>
      </ownedAttribute>
      <ownedAttribute xmi:id="_8f7RoOvgEeemYNdmj6WL9w" name="asSpecializedKind" isOrdered="true" aggregation="composite">
-        <type xmi:type="uml:Class" href="medication.uml#_VzVSkM86EeGVX9h3ivlQvw"/>
+        <type xmi:type="uml:Class" href="pharm.uml#_VzVSkM86EeGVX9h3ivlQvw"/>
        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8f74sOvgEeemYNdmj6WL9w" value="*"/>
        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8f74sevgEeemYNdmj6WL9w"/>
      </ownedAttribute>
      <ownedAttribute xmi:id="_80cwIOvgEeemYNdmj6WL9w" name="part" isOrdered="true" aggregation="composite">
-        <type xmi:type="uml:Class" href="medication.uml#_VzV3H886EeGVX9h3ivlQvw"/>
+        <type xmi:type="uml:Class" href="pharm.uml#_VzV3H886EeGVX9h3ivlQvw"/>
        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_80dXMOvgEeemYNdmj6WL9w" value="*"/>
        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_80dXMevgEeemYNdmj6WL9w"/>
      </ownedAttribute>
      <ownedAttribute xmi:id="_NmS8sOvhEeemYNdmj6WL9w" name="ingredient" isOrdered="true" aggregation="composite">
-        <type xmi:type="uml:Class" href="medication.uml#_VzVRfM86EeGVX9h3ivlQvw"/>
+        <type xmi:type="uml:Class" href="pharm.uml#_VzVRfM86EeGVX9h3ivlQvw"/>
        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NmS8sevhEeemYNdmj6WL9w" value="*"/>
        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NmS8suvhEeemYNdmj6WL9w"/>
      </ownedAttribute>
@@ -6427,7 +6405,7 @@ The following types are used for structural RIM attributes</body>
      <appliedProfile href="pathmap://UML_PROFILES/common-profile.uml#_1P9GAG7eEeGRT9uCX2f8pg"/>
    </profileApplication>
  </uml:Model>
-  <Ecore:EPackage xmi:id="_DALS8K70EeGxJei_o6JmIA" base_Package="_DAHm0K70EeGxJei_o6JmIA" packageName="net.ihe.gazelle.cdaepsos3" nsPrefix="v3" nsURI="urn:hl7-org:v3"/>
+  <Ecore:EPackage xmi:id="_DALS8K70EeGxJei_o6JmIA" base_Package="_DAHm0K70EeGxJei_o6JmIA" packageName="net.ihe.gazelle.cdaepsos4" nsPrefix="v3" nsURI="urn:hl7-org:v3"/>
  <Ecore:EClass xmi:id="_DALS8a70EeGxJei_o6JmIA" xmlName="" base_Class="_DAHm0q70EeGxJei_o6JmIA" xmlContentKind="Mixed"/>
  <Ecore:EAttribute xmi:id="_DALS8q70EeGxJei_o6JmIA" xmlName=":mixed" xmlFeatureKind="ElementWildcard" base_Property="_DAHm0670EeGxJei_o6JmIA"/>
  <Ecore:EReference xmi:id="_DALS8670EeGxJei_o6JmIA" xmlName="xmlns:prefix" isTransient="true" xmlFeatureKind="Attribute" base_Property="_DAHm1q70EeGxJei_o6JmIA" isResolveProxies="false"/>
@@ -7483,14 +7461,12 @@ The following types are used for structural RIM attributes</body>
  <Ecore:EReference xmi:id="_CU8hEOvdEeemYNdmj6WL9w" xmlNamespace="urn:epsos-org:ep:medication" xmlFeatureKind="Element" base_Property="_CU76AOvdEeemYNdmj6WL9w" isResolveProxies="false"/>
  <Ecore:EReference xmi:id="_ac2fwOveEeemYNdmj6WL9w" xmlNamespace="urn:epsos-org:ep:medication" xmlFeatureKind="Element" base_Property="_ac14sOveEeemYNdmj6WL9w" isResolveProxies="false"/>
  <Ecore:EReference xmi:id="_TXB3I-vfEeemYNdmj6WL9w" xmlNamespace="urn:epsos-org:ep:medication" xmlFeatureKind="Element" base_Property="_TXB3IOvfEeemYNdmj6WL9w" isResolveProxies="false"/>
-  <Ecore:EReference xmi:id="_g2gUA-vfEeemYNdmj6WL9w" xmlNamespace="urn:epsos-org:ep:medication" xmlFeatureKind="Element" base_Property="_g2gUAOvfEeemYNdmj6WL9w" isResolveProxies="false"/>
-  <Ecore:EReference xmi:id="_hVbEoOvfEeemYNdmj6WL9w" xmlNamespace="urn:epsos-org:ep:medication" xmlFeatureKind="Element" base_Property="_hVZ2gOvfEeemYNdmj6WL9w" isResolveProxies="false"/>
-  <Ecore:EReference xmi:id="_hoaSEOvfEeemYNdmj6WL9w" xmlNamespace="urn:epsos-org:ep:medication" xmlFeatureKind="Element" base_Property="_hoZrAOvfEeemYNdmj6WL9w" isResolveProxies="false"/>
-  <Ecore:EReference xmi:id="_h54ckOvfEeemYNdmj6WL9w" xmlNamespace="urn:epsos-org:ep:medication" xmlFeatureKind="Element" base_Property="_h531gOvfEeemYNdmj6WL9w" isResolveProxies="false"/>
-  <Ecore:EReference xmi:id="_iMt5A-vfEeemYNdmj6WL9w" xmlNamespace="urn:epsos-org:ep:medication" xmlFeatureKind="Element" base_Property="_iMt5AOvfEeemYNdmj6WL9w" isResolveProxies="false"/>
-  <Ecore:EReference xmi:id="_2zNb4-vfEeemYNdmj6WL9w" xmlNamespace="urn:epsos-org:ep:medication" xmlFeatureKind="Element" base_Property="_2zNb4OvfEeemYNdmj6WL9w" isResolveProxies="false"/>
-  <Ecore:EReference xmi:id="_3NiAYOvfEeemYNdmj6WL9w" xmlNamespace="urn:epsos-org:ep:medication" xmlFeatureKind="Element" base_Property="_3NhZUOvfEeemYNdmj6WL9w" isResolveProxies="false"/>
-  <Ecore:EReference xmi:id="_3hEAYOvfEeemYNdmj6WL9w" xmlNamespace="urn:epsos-org:ep:medication" xmlFeatureKind="Element" base_Property="_3hDZUOvfEeemYNdmj6WL9w" isResolveProxies="false"/>
+  <Ecore:EReference xmi:id="_g2gUA-vfEeemYNdmj6WL9w" xmlNamespace="urn:hl7-org:pharm" xmlFeatureKind="Element" base_Property="_g2gUAOvfEeemYNdmj6WL9w" isResolveProxies="false"/>
+
+  <Ecore:EReference xmi:id="_h54ckOvfEeemYNdmj6WL9w" xmlNamespace="urn:hl7-org:pharm" xmlFeatureKind="Element" base_Property="_h531gOvfEeemYNdmj6WL9w" isResolveProxies="false"/>
+  <Ecore:EReference xmi:id="_iMt5A-vfEeemYNdmj6WL9w" xmlNamespace="urn:hl7-org:pharm" xmlFeatureKind="Element" base_Property="_iMt5AOvfEeemYNdmj6WL9w" isResolveProxies="false"/>
+
+
  <Ecore:EReference xmi:id="_75kcQ-vgEeemYNdmj6WL9w" xmlNamespace="urn:epsos-org:ep:medication" xmlFeatureKind="Element" base_Property="_75kcQOvgEeemYNdmj6WL9w" isResolveProxies="false"/>
  <Ecore:EReference xmi:id="_8f74suvgEeemYNdmj6WL9w" xmlNamespace="urn:epsos-org:ep:medication" xmlFeatureKind="Element" base_Property="_8f7RoOvgEeemYNdmj6WL9w" isResolveProxies="false"/>
  <Ecore:EReference xmi:id="_80dXMuvgEeemYNdmj6WL9w" xmlNamespace="urn:epsos-org:ep:medication" xmlFeatureKind="Element" base_Property="_80cwIOvgEeemYNdmj6WL9w" isResolveProxies="false"/>

--- a/cdaepsos-model/src/main/resources/modelad2/pharm.uml
+++ b/cdaepsos-model/src/main/resources/modelad2/pharm.uml
--- a/settings.xml
+++ b/settings.xml
@@ -7,5 +7,10 @@
            <username>${ARTIFACT_RELEASE_REPOSITORY_USER}</username>
            <password>${ARTIFACT_RELEASE_REPOSITORY_PASS}</password>
        </server>
+        <server>
+            <id>nexus-snapshots</id>
+            <username>${ARTIFACT_RELEASE_REPOSITORY_USER}</username>
+            <password>${ARTIFACT_RELEASE_REPOSITORY_PASS}</password>
+        </server>
    </servers>
 </settings>