Mentions légales du service

Skip to content
Snippets Groups Projects
Commit adbe84d6 authored by Achraf Achkari's avatar Achraf Achkari
Browse files

Merge branch 'master' into 'develop' 

Master

See merge request !12
parents be325748 34b54a34
No related branches found
No related tags found
2 merge requests!14Develop,!12Master
Hide whitespace changes
Inline Side-by-side
cda-model/pom.xml
+ 7
− 7
View file @ adbe84d6
......@@ -4,14 +4,14 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>cda-model</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
<packaging>jar</packaging>
......@@ -49,28 +49,28 @@
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>voc-model</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>common-models</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>nblock-model</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>datatypes-model</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>model-resources</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
......
cdaepsos-model/pom.xml
+ 8
− 8
View file @ adbe84d6
......@@ -4,14 +4,14 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>cdaepsos-model</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
<packaging>jar</packaging>
......@@ -38,33 +38,33 @@
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>voc-model</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>common-models</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>nblock-model</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>infr-model</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>datatypes-model</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>model-resources</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
</dependency>
......
common-models/pom.xml
+ 3
− 3
View file @ adbe84d6
......@@ -4,14 +4,14 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>common-models</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
<packaging>jar</packaging>
......@@ -37,7 +37,7 @@
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>model-resources</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
datatypes-model/pom.xml
+ 3
− 3
View file @ adbe84d6
......@@ -4,14 +4,14 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>datatypes-model</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
<packaging>jar</packaging>
......@@ -37,7 +37,7 @@
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>common-models</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
</dependency>
......
infr-model/pom.xml
+ 3
− 3
View file @ adbe84d6
......@@ -4,14 +4,14 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>infr-model</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
<packaging>jar</packaging>
......@@ -36,7 +36,7 @@
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>datatypes-model</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
</dependency>
......
model-resources/pom.xml
+ 2
− 2
View file @ adbe84d6
......@@ -4,7 +4,7 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......@@ -12,7 +12,7 @@
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>model-resources</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
......
nblock-model/pom.xml
+ 3
− 3
View file @ adbe84d6
......@@ -4,14 +4,14 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>nblock-model</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
<packaging>jar</packaging>
......@@ -36,7 +36,7 @@
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>model-resources</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
pom.xml
+ 1
− 1
View file @ adbe84d6
......@@ -4,7 +4,7 @@
<groupId>net.ihe.gazelle</groupId>
<artifactId>uml-models</artifactId>
<name>UML Models</name>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
......
voc-model/pom.xml
+ 3
− 3
View file @ adbe84d6
......@@ -4,14 +4,14 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>voc-model</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
<packaging>jar</packaging>
......@@ -36,7 +36,7 @@
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>model-resources</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.1-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