diff --git a/cda-model/pom.xml b/cda-model/pom.xml index 43608f436cdeb45005ca610314459cdc5c04c7c5..03cf3c07de416034ac47814b3b8646868c59eb44 100644 --- a/cda-model/pom.xml +++ b/cda-model/pom.xml @@ -4,14 +4,14 @@ <parent> <artifactId>uml-models</artifactId> <groupId>net.ihe.gazelle</groupId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>net.ihe.gazelle.model</groupId> <artifactId>cda-model</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>jar</packaging> @@ -49,28 +49,28 @@ <dependency> <groupId>net.ihe.gazelle.model</groupId> <artifactId>voc-model</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>net.ihe.gazelle.model</groupId> <artifactId>common-models</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>net.ihe.gazelle.model</groupId> <artifactId>nblock-model</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>net.ihe.gazelle.model</groupId> <artifactId>datatypes-model</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>net.ihe.gazelle.model</groupId> <artifactId>model-resources</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>commons-io</groupId> diff --git a/cdaepsos-model/pom.xml b/cdaepsos-model/pom.xml index f9315cfa1bfc51484513a026d0caf8ed3cb154d4..a8b18dac8fe67efdba8d2d998789e5b31faad2c5 100644 --- a/cdaepsos-model/pom.xml +++ b/cdaepsos-model/pom.xml @@ -4,14 +4,14 @@ <parent> <artifactId>uml-models</artifactId> <groupId>net.ihe.gazelle</groupId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>net.ihe.gazelle.model</groupId> <artifactId>cdaepsos-model</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>jar</packaging> @@ -38,33 +38,33 @@ <dependency> <groupId>net.ihe.gazelle.model</groupId> <artifactId>voc-model</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>net.ihe.gazelle.model</groupId> <artifactId>common-models</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>net.ihe.gazelle.model</groupId> <artifactId>nblock-model</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>net.ihe.gazelle.model</groupId> <artifactId>infr-model</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>net.ihe.gazelle.model</groupId> <artifactId>datatypes-model</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>net.ihe.gazelle.model</groupId> <artifactId>model-resources</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> diff --git a/common-models/pom.xml b/common-models/pom.xml index cb530466235fb18a1b54499bc8fc3bf333658a80..f8ce78803df8c7182a25b7f66c543c551599186a 100644 --- a/common-models/pom.xml +++ b/common-models/pom.xml @@ -4,14 +4,14 @@ <parent> <artifactId>uml-models</artifactId> <groupId>net.ihe.gazelle</groupId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>net.ihe.gazelle.model</groupId> <artifactId>common-models</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>jar</packaging> @@ -37,7 +37,7 @@ <dependency> <groupId>net.ihe.gazelle.model</groupId> <artifactId>model-resources</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> 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 7d56da502ccf68196506ad0beefd863f71914deb..4ee691557c3664f47eaf80343c22d06137738491 100644 --- a/datatypes-model/pom.xml +++ b/datatypes-model/pom.xml @@ -4,14 +4,14 @@ <parent> <artifactId>uml-models</artifactId> <groupId>net.ihe.gazelle</groupId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>net.ihe.gazelle.model</groupId> <artifactId>datatypes-model</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>jar</packaging> @@ -37,13 +37,9 @@ <dependency> <groupId>net.ihe.gazelle.model</groupId> <artifactId>common-models</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>net.ihe.gazelle.model</groupId> - <artifactId>model-resources</artifactId> - <version>3.0.1-SNAPSHOT</version> - </dependency> + </dependencies> </project> \ No newline at end of file diff --git a/infr-model/pom.xml b/infr-model/pom.xml index 667996db9d6c236ee79d8d432a32511a6a531c4b..5f3349206f5a2dcafeb951e2e4e7bf135a8ca669 100644 --- a/infr-model/pom.xml +++ b/infr-model/pom.xml @@ -4,14 +4,14 @@ <parent> <artifactId>uml-models</artifactId> <groupId>net.ihe.gazelle</groupId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>net.ihe.gazelle.model</groupId> <artifactId>infr-model</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>jar</packaging> @@ -36,13 +36,9 @@ <dependency> <groupId>net.ihe.gazelle.model</groupId> <artifactId>datatypes-model</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>net.ihe.gazelle.model</groupId> - <artifactId>model-resources</artifactId> - <version>3.0.1-SNAPSHOT</version> - </dependency> + </dependencies> </project> diff --git a/model-resources/pom.xml b/model-resources/pom.xml index c9035cc50c0edad4573f3bf4c6950400b0edcfda..87e8495ccaf644def0f5eb3eeb377a46d0737f06 100644 --- a/model-resources/pom.xml +++ b/model-resources/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>uml-models</artifactId> <groupId>net.ihe.gazelle</groupId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -12,7 +12,7 @@ <groupId>net.ihe.gazelle.model</groupId> <artifactId>model-resources</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> diff --git a/nblock-model/pom.xml b/nblock-model/pom.xml index 76e216d56dc190c7f7c1d4bc328ecb0448f7852f..6b31420ff673621f7ec497b7daa0a052fbdcbab8 100644 --- a/nblock-model/pom.xml +++ b/nblock-model/pom.xml @@ -4,14 +4,14 @@ <parent> <artifactId>uml-models</artifactId> <groupId>net.ihe.gazelle</groupId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>net.ihe.gazelle.model</groupId> <artifactId>nblock-model</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>jar</packaging> @@ -36,7 +36,7 @@ <dependency> <groupId>net.ihe.gazelle.model</groupId> <artifactId>model-resources</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> diff --git a/pom.xml b/pom.xml index d208b39a2725a6203f1eaec4267d5d04ffd59d6a..f855f099dc910aa19fcee49d614fb04820bda167 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <groupId>net.ihe.gazelle</groupId> <artifactId>uml-models</artifactId> <name>UML Models</name> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>pom</packaging> <properties> @@ -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> diff --git a/voc-model/pom.xml b/voc-model/pom.xml index dbd70f0179588a2892ba381d441d0153dfcac0d7..bb7c6ef57e1f6d9a47ca1aa826de5e61ad0d5c75 100644 --- a/voc-model/pom.xml +++ b/voc-model/pom.xml @@ -4,14 +4,14 @@ <parent> <artifactId>uml-models</artifactId> <groupId>net.ihe.gazelle</groupId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>net.ihe.gazelle.model</groupId> <artifactId>voc-model</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>jar</packaging> @@ -36,7 +36,7 @@ <dependency> <groupId>net.ihe.gazelle.model</groupId> <artifactId>model-resources</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project>