From 0ac75eccaa43438100107bcd30a585a32e845511 Mon Sep 17 00:00:00 2001
From: Achraf <aai@kereval.com>
Date: Wed, 1 Jun 2022 10:29:34 +0200
Subject: [PATCH 1/2] Choices initial solution structure
---
common-models/src/main/resources/models/common.uml | 11 +++++++++++
datatypes-model/pom.xml | 6 +-----
infr-model/pom.xml | 6 +-----
pom.xml | 6 +++---
4 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/common-models/src/main/resources/models/common.uml b/common-models/src/main/resources/models/common.uml
index 5cc4a4c..4fdf16c 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 c3acc1c..b612834 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 e85e561..4217957 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 cafcaa5..4445e85 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>
--
GitLab
From 33ee4424b91d4b988944ed2a1c594e047b7f5e38 Mon Sep 17 00:00:00 2001
From: nab <nabila-aazibou-el-gerrab@kereval.com>
Date: Tue, 28 Jun 2022 16:12:01 +0200
Subject: [PATCH 2/2] update pom version 3.1.0
---
cda-model/pom.xml | 14 +++++++-------
cdaepsos-model/pom.xml | 16 ++++++++--------
common-models/pom.xml | 6 +++---
datatypes-model/pom.xml | 6 +++---
infr-model/pom.xml | 6 +++---
model-resources/pom.xml | 4 ++--
nblock-model/pom.xml | 6 +++---
pom.xml | 2 +-
voc-model/pom.xml | 6 +++---
9 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/cda-model/pom.xml b/cda-model/pom.xml
index f22defe..9afcb3b 100644
--- a/cda-model/pom.xml
+++ b/cda-model/pom.xml
@@ -6,14 +6,14 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
- <version>3.0.0-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.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -51,28 +51,28 @@
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>voc-model</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>common-models</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>nblock-model</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>datatypes-model</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>model-resources</artifactId>
- <version>3.0.0-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 b81b551..25f521d 100644
--- a/cdaepsos-model/pom.xml
+++ b/cdaepsos-model/pom.xml
@@ -6,14 +6,14 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
- <version>3.0.0-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.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -40,33 +40,33 @@
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>voc-model</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>common-models</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>nblock-model</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>infr-model</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>datatypes-model</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>model-resources</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
diff --git a/common-models/pom.xml b/common-models/pom.xml
index 814668e..abf47c2 100644
--- a/common-models/pom.xml
+++ b/common-models/pom.xml
@@ -6,14 +6,14 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
- <version>3.0.0-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.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -39,7 +39,7 @@
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>model-resources</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
diff --git a/datatypes-model/pom.xml b/datatypes-model/pom.xml
index b612834..a1a484e 100644
--- a/datatypes-model/pom.xml
+++ b/datatypes-model/pom.xml
@@ -6,14 +6,14 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
- <version>3.0.0-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.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -39,7 +39,7 @@
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>common-models</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
diff --git a/infr-model/pom.xml b/infr-model/pom.xml
index 4217957..3ce79f5 100644
--- a/infr-model/pom.xml
+++ b/infr-model/pom.xml
@@ -6,14 +6,14 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
- <version>3.0.0-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.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -38,7 +38,7 @@
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>datatypes-model</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
diff --git a/model-resources/pom.xml b/model-resources/pom.xml
index 56dc128..e0eb48b 100644
--- a/model-resources/pom.xml
+++ b/model-resources/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -14,7 +14,7 @@
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>model-resources</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
diff --git a/nblock-model/pom.xml b/nblock-model/pom.xml
index 7f91b97..d1c9f5d 100644
--- a/nblock-model/pom.xml
+++ b/nblock-model/pom.xml
@@ -6,14 +6,14 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
- <version>3.0.0-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.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -38,7 +38,7 @@
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>model-resources</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index 4445e85..f855f09 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.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
diff --git a/voc-model/pom.xml b/voc-model/pom.xml
index 57fdc58..66eb304 100644
--- a/voc-model/pom.xml
+++ b/voc-model/pom.xml
@@ -6,14 +6,14 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
- <version>3.0.0-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.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -38,7 +38,7 @@
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>model-resources</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
--
GitLab