diff --git a/common-models/src/main/resources/models/common.uml b/common-models/src/main/resources/models/common.uml index 5cc4a4c5033f5d43dbf616bcc123fe74b6e3e915..4fdf16caa856b0625e8cb0a01711f86abe3435fc 100644 --- a/common-models/src/main/resources/models/common.uml +++ b/common-models/src/main/resources/models/common.uml @@ -291,6 +291,17 @@ </ownedOperation> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_UfOp8B5IEeW5Kph3CWqa0g" name="CommonOperationsStatic"> + <ownedOperation xmi:id="__PtYnBT28LK_-MgfxjxjMg" name="compareExactType" isStatic="true"> + <ownedParameter xmi:id="_CUnT8POIEeK_-MgfxjxjMg" name="return" direction="return"> + <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/> + </ownedParameter> + <ownedParameter xmi:id="_E9xNNLM4EeK_-MgfxjxjMg" name="element1"> + <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EClass"/> + </ownedParameter> + <ownedParameter xmi:id="_IEHYILM4EeK_-MgfxjxjMg" name="element2"> + <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> + </ownedParameter> + </ownedOperation> <ownedOperation xmi:id="_UfPRAB5IEeW5Kph3CWqa0g" name="matches" isStatic="true"> <ownedParameter xmi:id="_UfPRAR5IEeW5Kph3CWqa0g" name="return" direction="return"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/> diff --git a/datatypes-model/pom.xml b/datatypes-model/pom.xml index c3acc1cdc1a78e3a9c941609e2f47f72b36cb509..b612834887af9b6d59413418f983811863044cc8 100644 --- a/datatypes-model/pom.xml +++ b/datatypes-model/pom.xml @@ -42,10 +42,6 @@ <version>3.0.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>net.ihe.gazelle.model</groupId> - <artifactId>model-resources</artifactId> - <version>3.0.0-SNAPSHOT</version> - </dependency> + </dependencies> </project> \ No newline at end of file diff --git a/infr-model/pom.xml b/infr-model/pom.xml index e85e5613a8f57478b161e91623c6d1085a2cd424..42179575f5c707847006552edd449cb669fdf286 100644 --- a/infr-model/pom.xml +++ b/infr-model/pom.xml @@ -41,10 +41,6 @@ <version>3.0.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>net.ihe.gazelle.model</groupId> - <artifactId>model-resources</artifactId> - <version>3.0.0-SNAPSHOT</version> - </dependency> + </dependencies> </project> diff --git a/pom.xml b/pom.xml index cafcaa5238476c8aae968b452d9c5c4f21497e31..4445e8532c8aa3c087314fb97a49e00a6b806119 100644 --- a/pom.xml +++ b/pom.xml @@ -69,14 +69,14 @@ <modules> - <module>cda-model</module> - <module>cdaepsos-model</module> + <module>model-resources</module> <module>common-models</module> <module>datatypes-model</module> <module>infr-model</module> - <module>model-resources</module> <module>nblock-model</module> <module>voc-model</module> + <module>cda-model</module> + <module>cdaepsos-model</module> </modules> <profiles>