Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 0b1c3c4e authored by Alexandre Pocinho's avatar Alexandre Pocinho
Browse files

Merge branch 'master' into develop 

# Conflicts:
#	.gitlab-ci.yml
#	http-validator-client/pom.xml
#	matchbox-client/pom.xml
#	pixm-connector-service/pom.xml
#	pom.xml
parents f515a5f2 081e7da4
No related branches found
No related tags found
1 merge request!10Remove hardcoded mandatory targetSytem + upgrade HAPI FHIR version
Pipeline #921033 failed
Stage: build
    Stage: test
      Stage: publish
        Hide whitespace changes
        Inline Side-by-side
        .gitlab-ci.yml
        + 4
        − 1
        View file @ 0b1c3c4e
        ......@@ -2,7 +2,7 @@
        include:
        - project: 'gazelle/private/gitlab-ci-templates'
        file: 'extends-v2.yaml'
        ref: '1.0.2'
        ref: 'master'
        # Define stages
        stages:
        ......@@ -64,4 +64,7 @@ release/code:
        stage: release
        extends:
        - .releaseCodeForJava
        variables:
        P_MAVEN_JAVADOC_SKIP: "true"
        SCRIPTS_GIT_BRANCH: "master"
        http-validator-client/pom.xml
        + 3
        − 5
        View file @ 0b1c3c4e
        <?xml version="1.0" encoding="UTF-8"?>
        <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="http://maven.apache.org/POM/4.0.0"
        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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
        <groupId>net.ihe.gazelle</groupId>
        <artifactId>pixm-connector</artifactId>
        <version>3.0.0-SNAPSHOT</version>
        <version>3.0.1-SNAPSHOT</version>
        </parent>
        <artifactId>http-validator-client</artifactId>
        <name>HTTP Validator Client</name>
        <version>3.0.0-SNAPSHOT</version>
        <version>3.0.1-SNAPSHOT</version>
        <properties>
        <maven.compiler.source>17</maven.compiler.source>
        ......
        matchbox-client/pom.xml
        + 3
        − 5
        View file @ 0b1c3c4e
        <?xml version="1.0" encoding="UTF-8"?>
        <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="http://maven.apache.org/POM/4.0.0"
        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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
        <groupId>net.ihe.gazelle</groupId>
        <artifactId>pixm-connector</artifactId>
        <version>3.0.0-SNAPSHOT</version>
        <version>3.0.1-SNAPSHOT</version>
        </parent>
        <artifactId>matchbox-client</artifactId>
        <name>Matchbox Client</name>
        <version>3.0.0-SNAPSHOT</version>
        <version>3.0.1-SNAPSHOT</version>
        <properties>
        <maven.compiler.source>17</maven.compiler.source>
        ......
        pixm-connector-service/pom.xml
        + 5
        − 7
        View file @ 0b1c3c4e
        <?xml version="1.0" encoding="UTF-8"?>
        <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="http://maven.apache.org/POM/4.0.0"
        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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
        <groupId>net.ihe.gazelle</groupId>
        <artifactId>pixm-connector</artifactId>
        <version>3.0.0-SNAPSHOT</version>
        <version>3.0.1-SNAPSHOT</version>
        </parent>
        <artifactId>pixm-connector-service</artifactId>
        <name>PIXm Connector Service</name>
        <version>3.0.0-SNAPSHOT</version>
        <version>3.0.1-SNAPSHOT</version>
        <packaging>war</packaging>
        <properties>
        ......@@ -312,12 +310,12 @@
        <dependency>
        <groupId>net.ihe.gazelle</groupId>
        <artifactId>matchbox-client</artifactId>
        <version>3.0.0-SNAPSHOT</version>
        <version>3.0.1-SNAPSHOT</version>
        </dependency>
        <dependency>
        <groupId>net.ihe.gazelle</groupId>
        <artifactId>http-validator-client</artifactId>
        <version>3.0.0-SNAPSHOT</version>
        <version>3.0.1-SNAPSHOT</version>
        <scope>compile</scope>
        </dependency>
        <dependency>
        ......
        pom.xml
        + 324
        − 76
        View file @ 0b1c3c4e
        <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_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/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <groupId>net.ihe.gazelle</groupId>
        <artifactId>pixm-connector</artifactId>
        ......@@ -9,7 +8,7 @@
        <module>matchbox-client</module>
        <module>http-validator-client</module>
        </modules>
        <version>3.0.0-SNAPSHOT</version>
        <version>3.0.1-SNAPSHOT</version>
        <name>Pixm Connector</name>
        <properties>
        ......@@ -29,7 +28,7 @@
        <git.project.url>
        https://${git.user.name}:${git.user.token}@gitlab.inria.fr/gazelle/applications/test-execution/simulator/pixm-connector.git
        </git.project.url>
        <hapi.fhir.version>6.11.9-SNAPSHOT</hapi.fhir.version>
        <hapi.fhir.version>7.0.0-BETA</hapi.fhir.version>
        <maven.release.plugin.version>2.5.3</maven.release.plugin.version>
        <nexus.staging.maven.plugin.version>1.6.8</nexus.staging.maven.plugin.version>
        <sonar.maven.plugin>3.9.0.2155</sonar.maven.plugin>
        ......@@ -56,18 +55,18 @@
        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
        </properties>
        <scm>
        <connection>scm:git:${git.project.url}</connection>
        <url>scm:git:${git.project.url}</url>
        <developerConnection>scm:git:${git.project.url}</developerConnection>
        <tag>HEAD</tag>
        </scm>
        <scm>
        <connection>scm:git:${git.project.url}</connection>
        <url>scm:git:${git.project.url}</url>
        <developerConnection>scm:git:${git.project.url}</developerConnection>
        <tag>HEAD</tag>
        </scm>
        <repositories>
        <repository>
        <releases>
        <enabled>true</enabled>
        <updatePolicy>never</updatePolicy>
        <updatePolicy>always</updatePolicy>
        </releases>
        <snapshots>
        <enabled>true</enabled>
        ......@@ -179,71 +178,320 @@
        </profile>
        </profiles>
        <build>
        <finalName>pixm_fhir_server</finalName>
        <dependencyManagement>
        <dependencies>
        <dependency>
        <groupId>org.mockito</groupId>
        <artifactId>mockito-core</artifactId>
        <version>${mockito.core.version}</version>
        <scope>test</scope>
        </dependency>
        <dependency>
        <groupId>org.mockito</groupId>
        <artifactId>mockito-junit-jupiter</artifactId>
        <version>${mockito.junit.jupiter.version}</version>
        </dependency>
        <dependency>
        <groupId>net.ihe.gazelle</groupId>
        <artifactId>validation-jaxrs-api</artifactId>
        <version>1.0.0</version>
        </dependency>
        <dependency>
        <groupId>net.ihe.gazelle</groupId>
        <artifactId>validation-api</artifactId>
        <version>1.0.0</version>
        </dependency>
        <!-- This dependency includes the core HAPI-FHIR classes -->
        <dependency>
        <groupId>ca.uhn.hapi.fhir</groupId>
        <artifactId>hapi-fhir-base</artifactId>
        <version>${hapi.fhir.version}</version>
        </dependency>
        <dependency>
        <groupId>ca.uhn.hapi.fhir</groupId>
        <artifactId>hapi-fhir-server</artifactId>
        <version>${hapi.fhir.version}</version>
        </dependency>
        <!-- At least one "structures" JAR must also be included -->
        <dependency>
        <groupId>ca.uhn.hapi.fhir</groupId>
        <artifactId>hapi-fhir-structures-r4</artifactId>
        <version>${hapi.fhir.version}</version>
        </dependency>
        <!-- Used for validation -->
        <dependency>
        <groupId>ca.uhn.hapi.fhir</groupId>
        <artifactId>hapi-fhir-validation-resources-r4</artifactId>
        <version>${hapi.fhir.version}</version>
        </dependency>
        <dependency>
        <groupId>jakarta.platform</groupId>
        <artifactId>jakarta.jakartaee-api</artifactId>
        <version>${jakarta.jakartaee.api.version}</version>
        </dependency>
        <dependency>
        <groupId>jakarta.servlet</groupId>
        <artifactId>jakarta.servlet-api</artifactId>
        <version>${jakarta.servlet.api.version}</version>
        </dependency>
        <dependency>
        <groupId>org.fhir</groupId>
        <artifactId>ucum</artifactId>
        <version>${ucum.version}</version>
        </dependency>
        </dependencies>
        </dependencyManagement>
        <plugins>
        <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-release-plugin</artifactId>
        <version>${maven.release.plugin.version}</version>
        <configuration>
        <tagNameFormat>@{project.version}</tagNameFormat>
        <autoVersionSubmodules>true</autoVersionSubmodules>
        <releaseProfiles>release</releaseProfiles>
        </configuration>
        </plugin>
        <!-- Tell Maven which Java source version you want to use -->
        <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <version>3.8.1</version>
        <configuration>
        <source>${java.version}</source>
        <target>${java.version}</target>
        </configuration>
        </plugin>
        <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-surefire-plugin</artifactId>
        <version>3.0.0-M3</version>
        <configuration>
        <properties>
        <property>
        <name>listener</name>
        <value>io.qameta.allure.junit5.AllureJunit5</value>
        </property>
        </properties>
        <dependenciesToScan>
        <dependency>net.ihe.gazelle:lib.unit-test</dependency>
        </dependenciesToScan>
        <testFailureIgnore>false</testFailureIgnore>
        <argLine>
        -javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar"
        </argLine>
        <systemProperties>
        <property>
        <name>junit.jupiter.extensions.autodetection.enabled</name>
        <value>true</value>
        </property>
        <property>
        <name>allure.results.directory</name>
        <value>${project.basedir}/target/allure-results</value>
        </property>
        </systemProperties>
        <argLine>${argLine}</argLine>
        </configuration>
        <dependencies>
        <dependency>
        <groupId>org.junit.jupiter</groupId>
        <artifactId>junit-jupiter-api</artifactId>
        <version>${junit.jupiter.version}</version>
        </dependency>
        <dependency>
        <groupId>org.junit.jupiter</groupId>
        <artifactId>junit-jupiter-engine</artifactId>
        <version>${junit.jupiter.version}</version>
        </dependency>
        <dependency>
        <groupId>org.aspectj</groupId>
        <artifactId>aspectjweaver</artifactId>
        <version>${aspectj.version}</version>
        </dependency>
        </dependencies>
        </plugin>
        <plugin>
        <groupId>io.qameta.allure</groupId>
        <artifactId>allure-maven</artifactId>
        <version>2.10.0</version>
        <configuration>
        <allureDownloadUrl>https://github.com/allure-framework/allure-maven/archive/refs/tags/2.10.0.zip</allureDownloadUrl>
        </configuration>
        </plugin>
        <!-- The configuration here tells the WAR plugin to include the FHIR Tester
        overlay. You can omit it if you are not using that feature. -->
        <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-war-plugin</artifactId>
        <configuration>
        <overlays>
        <overlay>
        <groupId>ca.uhn.hapi.fhir</groupId>
        <artifactId>hapi-fhir-testpage-overlay</artifactId>
        </overlay>
        </overlays>
        </configuration>
        </plugin>
        <plugin>
        <groupId>org.jacoco</groupId>
        <artifactId>jacoco-maven-plugin</artifactId>
        <version>0.8.6</version>
        <executions>
        <execution>
        <id>pre-unit-test</id>
        <goals>
        <goal>prepare-agent</goal>
        </goals>
        </execution>
        <execution>
        <id>default-report</id>
        <phase>package</phase>
        <goals>
        <goal>report</goal>
        </goals>
        <configuration>
        <dataFile>${project.build.directory}/target/jacoco.exec</dataFile>
        </configuration>
        </execution>
        </executions>
        </plugin>
        <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-javadoc-plugin</artifactId>
        <configuration>
        <additionalparam>-Xdoclint:none</additionalparam>
        </configuration>
        </plugin>
        </plugins>
        </build>
        <dependencies>
        <dependency>
        <groupId>net.ihe.gazelle</groupId>
        <artifactId>framework.preferences-model-api</artifactId>
        <version>1.0.0</version>
        </dependency>
        <dependency>
        <groupId>net.ihe.gazelle</groupId>
        <artifactId>framework.operational-preferences-service</artifactId>
        <version>1.0.0</version>
        </dependency>
        <dependency>
        <groupId>org.junit.jupiter</groupId>
        <artifactId>junit-jupiter</artifactId>
        <version>5.6.0</version>
        <scope>test</scope>
        </dependency>
        <!-- https://mvnrepository.com/artifact/org.junit.platform/junit-platform-commons -->
        <dependency>
        <groupId>org.junit.platform</groupId>
        <artifactId>junit-platform-commons</artifactId>
        <version>1.7.2</version>
        </dependency>
        <dependency>
        <groupId>org.junit.platform</groupId>
        <artifactId>junit-platform-launcher</artifactId>
        <version>1.7.2</version>
        </dependency>
        <dependency>
        <groupId>net.ihe.gazelle</groupId>
        <artifactId>framework.preferences-model-api</artifactId>
        <version>1.0.0</version>
        </dependency>
        <!-- This dependency includes the core HAPI-FHIR classes -->
        <dependency>
        <groupId>ca.uhn.hapi.fhir</groupId>
        <artifactId>hapi-fhir-base</artifactId>
        <version>${hapifhir_version}</version>
        </dependency>
        <dependency>
        <groupId>ca.uhn.hapi.fhir</groupId>
        <artifactId>hapi-fhir-server</artifactId>
        <version>${hapifhir_version}</version>
        </dependency>
        <!-- At least one "structures" JAR must also be included -->
        <dependency>
        <groupId>ca.uhn.hapi.fhir</groupId>
        <artifactId>hapi-fhir-structures-r4</artifactId>
        <version>${hapifhir_version}</version>
        </dependency>
        <!-- Used for validation -->
        <dependency>
        <groupId>ca.uhn.hapi.fhir</groupId>
        <artifactId>hapi-fhir-validation-resources-r4</artifactId>
        <version>${hapifhir_version}</version>
        </dependency>
        <dependency>
        <groupId>com.phloc</groupId>
        <artifactId>phloc-schematron</artifactId>
        <version>2.7.0</version>
        </dependency>
        <!-- This dependency is used for the "FHIR Tester" web app overlay -->
        <dependency>
        <groupId>ca.uhn.hapi.fhir</groupId>
        <artifactId>hapi-fhir-testpage-overlay</artifactId>
        <version>${hapifhir_version}</version>
        <type>war</type>
        <scope>provided</scope>
        </dependency>
        <dependency>
        <groupId>ca.uhn.hapi.fhir</groupId>
        <artifactId>hapi-fhir-testpage-overlay</artifactId>
        <version>${hapifhir_version}</version>
        <classifier>classes</classifier>
        <scope>provided</scope>
        </dependency>
        <!-- HAPI-FHIR uses Logback for logging support. The logback library is
        included automatically by Maven as a part of the hapi-fhir-base dependency,
        but you also need to include a logging library. Logback is used here, but
        log4j would also be fine. -->
        <dependency>
        <groupId>ch.qos.logback</groupId>
        <artifactId>logback-classic</artifactId>
        <version>1.1.7</version>
        </dependency>
        <dependency>
        <groupId>info.debatty</groupId>
        <artifactId>java-string-similarity</artifactId>
        <version>RELEASE</version>
        </dependency>
        <!-- Needed for JEE/Servlet support -->
        <dependency>
        <groupId>javax</groupId>
        <artifactId>javaee-api</artifactId>
        <version>8.0.1</version>
        </dependency>
        <dependency>
        <groupId>javax.servlet</groupId>
        <artifactId>javax.servlet-api</artifactId>
        <version>4.0.1</version>
        </dependency>
        <!-- If you are using HAPI narrative generation, you will need to include
        Thymeleaf as well. Otherwise the following can be omitted. -->
        <dependency>
        <groupId>org.thymeleaf</groupId>
        <artifactId>thymeleaf</artifactId>
        <version>3.0.2.RELEASE</version>
        </dependency>
        <dependency>
        <groupId>org.fhir</groupId>
        <artifactId>ucum</artifactId>
        <version>1.0.3</version>
        </dependency>
        <dependency>
        <groupId>com.github.ben-manes.caffeine</groupId>
        <artifactId>caffeine</artifactId>
        <version>3.0.2</version>
        </dependency>
        <dependency>
        <groupId>net.ihe.gazelle</groupId>
        <artifactId>app.patient-registry-xref-search-client</artifactId>
        <version>2.1.0</version>
        </dependency>
        <dependency>
        <groupId>net.ihe.gazelle</groupId>
        <artifactId>app.patient-registry-search-client</artifactId>
        <version>2.1.0</version>
        </dependency>
        <dependency>
        <groupId>net.ihe.gazelle</groupId>
        <artifactId>app.patient-registry-feed-client</artifactId>
        <version>2.1.0</version>
        </dependency>
        <!-- Used for CORS support -->
        <dependency>
        <groupId>org.ebaysf.web</groupId>
        <artifactId>cors-filter</artifactId>
        <version>1.0.1</version>
        <exclusions>
        <exclusion>
        <artifactId>servlet-api</artifactId>
        <groupId>javax.servlet</groupId>
        </exclusion>
        </exclusions>
        </dependency>
        <dependency>
        <groupId>org.mockito</groupId>
        <artifactId>mockito-all</artifactId>
        <version>1.10.19</version>
        <scope>test</scope>
        </dependency>
        <dependency>
        <groupId>org.powermock</groupId>
        <artifactId>powermock-module-junit4</artifactId>
        <version>2.0.9</version>
        <scope>test</scope>
        </dependency>
        <dependency>
        <groupId>io.qameta.allure</groupId>
        <artifactId>allure-junit5</artifactId>
        <version>2.14.0</version>
        <scope>test</scope>
        </dependency>
        <dependency>
        <groupId>com.googlecode.json-simple</groupId>
        <artifactId>json-simple</artifactId>
        <version>1.1.1</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