Commit 4161eaf2 authored by Franck Desaize's avatar Franck Desaize
Browse files

Fix Complication bug

parent 962c8850
......@@ -24,10 +24,6 @@ variables:
P_DB_SCHEMA_PATH: "patient-registry-service/src/main/resources/sql/schema.sql"
P_DB_NAME: "pam-simulator"
services:
- postgres:9.6.17-alpine
# Define jobs
code:
stage: build
......@@ -42,16 +38,10 @@ quality:
stage: tests
extends:
- .testQualityForJavaWithSonarqubeAndPostgresql
services:
- postgres:9.6.17-alpine
variables:
P_MAVEN_IMAGE_TAG: "wildfly-3.6.3-18.0.1.Final"
P_CODE_BINARIES: "target/classes/"
P_CODE_JACOCO_REPORT_PATH: "target/jacoco.exec"
P_CODE_JUNIT_REPORTS_PATH: "target/surefire-reports"
P_CODE_DYNAMIC_ANALYSIS: "reuseReports"
P_CODE_COVERAGE_PLUGIN: "jacoco"
P_CODE_SOURCE_ENCODING: "UTF-8"
P_CODE_LANGUAGE: "java"
P_CODE_DEVELOPER_EDITION: "true"
release/code:
stage: release
......
......@@ -157,6 +157,24 @@
<version>3.3.3</version>
<scope>test</scope>
</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>1.7.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>1.7.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<profile>
......
......@@ -16,8 +16,6 @@
<class>net.ihe.gazelle.app.patientregistryservice.adapter.dao.pamsimulator.model.patient.PatientAddressDB</class>
<class>net.ihe.gazelle.app.patientregistryservice.adapter.dao.pamsimulator.model.patient.RawAddressDB</class>
<class>net.ihe.gazelle.app.patientregistryservice.adapter.dao.pamsimulator.model.references.CrossReferenceDB</class>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<!-- Configuring JDBC properties -->
<property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test;MODE=PostgreSQL;DATABASE_TO_LOWER=TRUE"/>
......@@ -28,7 +26,6 @@
<property name="hibernate.hbm2ddl.auto" value="create"/>
<property name="hibernate.format_sql" value="false"/>
<property name="hibernate.show_sql" value="true"/>
<property name="hibernate.cache.use_second_level_cache" value="false"/>
</properties>
</persistence-unit>
......
......@@ -20,7 +20,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<dependency.check.version>5.2.4</dependency.check.version>
<sonar.maven.plugin.version>3.7.0.1746</sonar.maven.plugin.version>
<sonar.maven.plugin>3.5.0.1254</sonar.maven.plugin>
<maven.release.plugin.version>2.5.3</maven.release.plugin.version>
<nexus.staging.maven.plugin.version>1.6.8</nexus.staging.maven.plugin.version>
<dependency.check.skip>true</dependency.check.skip>
<cvss.score.level.tolerate>8</cvss.score.level.tolerate>
<nexus.url>https://gazelle.ihe.net/nexus</nexus.url>
......@@ -63,6 +65,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<release>11</release>
<compilerVersion>${java.version}</compilerVersion>
<fork>true</fork>
<source>${java.version}</source>
......@@ -70,29 +73,6 @@
<compilerArgument>-proc:none</compilerArgument>
</configuration>
</plugin>
<plugin>
<groupId>org.bsc.maven</groupId>
<artifactId>maven-processor-plugin</artifactId>
<version>4.0-beta1</version>
<executions>
<execution>
<id>generateCoverage</id>
<goals>
<goal>process</goal>
<goal>process-test</goal>
</goals>
<phase>compile</phase>
<configuration>
<processors>
<processor>net.ihe.gazelle.lib.annotations.CoversProcessor</processor>
</processors>
<systemProperties>
<csv.name>patient-registry.csv</csv.name>
</systemProperties>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
......@@ -156,7 +136,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<version>${maven.release.plugin.version}</version>
<configuration>
<tagNameFormat>@{project.version}</tagNameFormat>
<autoVersionSubmodules>true</autoVersionSubmodules>
......@@ -197,7 +177,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<version>${nexus.staging.maven.plugin.version}</version>
<executions>
<execution>
<id>default-deploy</id>
......@@ -300,6 +280,12 @@
<version>1.4.200</version>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
<groupId>org.antlr</groupId>
<artifactId>antlr-complete</artifactId>
<version>3.5.2</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
......
......@@ -12,6 +12,13 @@
<password>${CS_SVC_ARTIFACT_DISTRIBUTION_REPOSITORY_PASS}</password>
</server>
</servers>
<mirrors>
<mirror>
<id>nexus</id>
<mirrorOf>*</mirrorOf>
<url>https://gazelle.ihe.net/nexus/content/groups/public</url>
</mirror>
</mirrors>
<pluginGroups>
<pluginGroup>com.googlecode.crowdin-maven</pluginGroup>
......
Markdown is supported
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