Mentions légales du service

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

Merge branch 'master' into 'develop' 

merge master into develop

See merge request !19
parents d26f47da 3ed7c1c5
Branches develop
No related tags found
1 merge request!19merge master into develop
Hide whitespace changes
Inline Side-by-side
cda-model/pom.xml
+ 7
− 7
View file @ d54891f4
......@@ -4,14 +4,14 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.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.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
......@@ -49,28 +49,28 @@
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>voc-model</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>common-models</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>nblock-model</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>datatypes-model</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>model-resources</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
......
cdaepsos-model/pom.xml
+ 3
− 3
View file @ d54891f4
......@@ -4,14 +4,14 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.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.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
......@@ -58,7 +58,7 @@
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>datatypes-model</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
</dependency>
<dependency>
......
cdaxehealth-model/pom.xml
+ 3
− 5
View file @ d54891f4
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>cdaxehealth-model</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
<properties>
<maven.compiler.source>11</maven.compiler.source>
......
common-models/pom.xml
+ 3
− 3
View file @ d54891f4
......@@ -4,14 +4,14 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.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.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
......@@ -37,7 +37,7 @@
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>model-resources</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
datatypes-model/pom.xml
+ 3
− 3
View file @ d54891f4
......@@ -4,14 +4,14 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.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.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
......@@ -37,7 +37,7 @@
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>common-models</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
</dependency>
......
infr-model/pom.xml
+ 3
− 3
View file @ d54891f4
......@@ -4,14 +4,14 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.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.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
......@@ -36,7 +36,7 @@
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>datatypes-model</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
</dependency>
......
model-resources/pom.xml
+ 2
− 2
View file @ d54891f4
......@@ -4,7 +4,7 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......@@ -12,7 +12,7 @@
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>model-resources</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
......
nblock-model/pom.xml
+ 3
− 3
View file @ d54891f4
......@@ -4,14 +4,14 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.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.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
......@@ -36,7 +36,7 @@
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>model-resources</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
pom.xml
+ 1
− 1
View file @ d54891f4
......@@ -4,7 +4,7 @@
<groupId>net.ihe.gazelle</groupId>
<artifactId>uml-models</artifactId>
<name>UML Models</name>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
......
voc-model/pom.xml
+ 3
− 3
View file @ d54891f4
......@@ -4,14 +4,14 @@
<parent>
<artifactId>uml-models</artifactId>
<groupId>net.ihe.gazelle</groupId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.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.2.0-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
......@@ -36,7 +36,7 @@
<dependency>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>model-resources</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.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