Mentions légales du service

Skip to content
Snippets Groups Projects
Commit be325748 authored by Nabila Aazibou-el-gerrab's avatar Nabila Aazibou-el-gerrab
Browse files

Merge branch 'feature/choices-implementation' into 'develop' 

Feature/choices implementation

See merge request !10
parents 066f85ae 8ffb00c2
No related branches found
No related tags found
2 merge requests!11Develop,!10Feature/choices implementation
Hide whitespace changes
Inline Side-by-side
Showing
with 49 additions and 46 deletions
cda-model/pom.xml
+ 7
− 7
View file @ be325748
......@@ -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>
......
cdaepsos-model/pom.xml
+ 8
− 8
View file @ be325748
......@@ -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>
......
common-models/pom.xml
+ 3
− 3
View file @ be325748
......@@ -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>
common-models/src/main/resources/models/common.uml
+ 11
− 0
View file @ be325748
......@@ -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"/>
......
datatypes-model/pom.xml
+ 4
− 8
View file @ be325748
......@@ -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
infr-model/pom.xml
+ 4
− 8
View file @ be325748
......@@ -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>
model-resources/pom.xml
+ 2
− 2
View file @ be325748
......@@ -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>
......
nblock-model/pom.xml
+ 3
− 3
View file @ be325748
......@@ -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>
pom.xml
+ 4
− 4
View file @ be325748
......@@ -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>
......
voc-model/pom.xml
+ 3
− 3
View file @ be325748
......@@ -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>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment