Une MAJ de sécurité est nécessaire sur notre version actuelle. Elle sera effectuée lundi 02/08 entre 12h30 et 13h. L'interruption de service devrait durer quelques minutes (probablement moins de 5 minutes).

Commit 540685e9 authored by luc chatty's avatar luc chatty
Browse files

Merge branch 'feature/PATREG-31.b' into 'feature/PATREG-31'

Feature/patreg 31.b

See merge request !3
parents c17084cc 39455c6b
Pipeline #131954 failed with stages
in 2 minutes and 15 seconds
...@@ -17,6 +17,11 @@ ...@@ -17,6 +17,11 @@
<packaging>ejb</packaging> <packaging>ejb</packaging>
<properties>
<postgresql.hostandport>localhost:5432</postgresql.hostandport>
<postgresql.gazelle.password>changeIt</postgresql.gazelle.password>
</properties>
<build> <build>
<resources> <resources>
<resource> <resource>
...@@ -161,6 +166,98 @@ ...@@ -161,6 +166,98 @@
</activation> </activation>
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>sql-maven-plugin</artifactId>
<version>1.5</version>
<dependencies>
<!-- specify the dependent jdbc driver here -->
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>9.1-901.jdbc4</version>
</dependency>
</dependencies>
<!-- common configuration shared by all executions -->
<configuration>
<driver>org.postgresql.Driver</driver>
<url>jdbc:postgresql://${postgresql.hostandport}/pam-simulator-PR-test</url>
<username>postgres</username>
<password>root</password>
<!-- You can comment out username/password configurations and have
maven to look them up in your settings.xml using ${settingsKey} -->
<settingsKey>sensibleKey</settingsKey>
</configuration>
<executions>
<execution>
<id>drop-db-before-test-if-any</id>
<phase>generate-test-resources</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<!-- need another database to drop the targeted one -->
<url>jdbc:postgresql://${postgresql.hostandport}/postgres</url>
<autocommit>true</autocommit>
<sqlCommand>drop database "pam-simulator-PR-test"</sqlCommand>
<!-- ignore error when database is not avaiable -->
<onError>continue</onError>
</configuration>
</execution>
<execution>
<id>create-db-before-test</id>
<phase>generate-test-resources</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<!-- need another database to drop the targeted one -->
<url>jdbc:postgresql://${postgresql.hostandport}/postgres</url>
<autocommit>true</autocommit>
<sqlCommand>create database "pam-simulator-PR-test"</sqlCommand>
<!-- ignore error when database is not avaiable -->
<onError>continue</onError>
</configuration>
</execution>
<execution>
<id>create-user-before-test</id>
<phase>generate-test-resources</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<!-- need another database to drop the targeted one -->
<url>jdbc:postgresql://${postgresql.hostandport}/pam-simulator-PR-test</url>
<autocommit>true</autocommit>
<sqlCommand>create user gazelle with password '${postgresql.gazelle.password}'</sqlCommand>
<!-- ignore error when database is not avaiable -->
<onError>continue</onError>
</configuration>
</execution>
<execution>
<id>create-schema</id>
<phase>generate-test-resources</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<autocommit>true</autocommit>
<srcFiles>
<srcFile>src/main/resources/sql/schema.sql</srcFile>
</srcFiles>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.wildfly.plugins</groupId> <groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId> <artifactId>wildfly-maven-plugin</artifactId>
...@@ -190,10 +287,10 @@ ...@@ -190,10 +287,10 @@
<properties> <properties>
<jndi-name>java:/jboss/datasources/patientRegistryDS</jndi-name> <jndi-name>java:/jboss/datasources/patientRegistryDS</jndi-name>
<enabled>true</enabled> <enabled>true</enabled>
<connection-url>jdbc:postgresql://localhost:5432/pam-simulator</connection-url> <connection-url>jdbc:postgresql://${postgresql.hostandport}/pam-simulator-PR-test</connection-url>
<driver-name>postgresql</driver-name> <driver-name>postgresql</driver-name>
<user-name>gazelle</user-name> <user-name>gazelle</user-name>
<password>gazelle</password> <password>${postgresql.gazelle.password}</password>
</properties> </properties>
</resource> </resource>
</resources> </resources>
......
...@@ -23,11 +23,7 @@ SET row_security = off; ...@@ -23,11 +23,7 @@ SET row_security = off;
CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog; CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
--
-- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner:
--
COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
SET default_tablespace = ''; SET default_tablespace = '';
......
...@@ -112,6 +112,7 @@ ...@@ -112,6 +112,7 @@
<dependencySourceIncludes> <dependencySourceIncludes>
<dependencySourceInclude>com.gitb.*</dependencySourceInclude> <dependencySourceInclude>com.gitb.*</dependencySourceInclude>
</dependencySourceIncludes> </dependencySourceIncludes>
<javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
...@@ -218,7 +219,7 @@ ...@@ -218,7 +219,7 @@
<dependency> <dependency>
<groupId>net.ihe.gazelle</groupId> <groupId>net.ihe.gazelle</groupId>
<artifactId>framework.logger-service</artifactId> <artifactId>framework.logger-service</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax</groupId> <groupId>javax</groupId>
...@@ -229,7 +230,7 @@ ...@@ -229,7 +230,7 @@
<dependency> <dependency>
<groupId>net.ihe.gazelle</groupId> <groupId>net.ihe.gazelle</groupId>
<artifactId>lib.unit-test</artifactId> <artifactId>lib.unit-test</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -240,24 +241,24 @@ ...@@ -240,24 +241,24 @@
<dependency> <dependency>
<groupId>net.ihe.gazelle</groupId> <groupId>net.ihe.gazelle</groupId>
<artifactId>lib.gitb-processing-client</artifactId> <artifactId>lib.gitb-processing-client</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.ihe.gazelle</groupId> <groupId>net.ihe.gazelle</groupId>
<artifactId>lib.search-model-api</artifactId> <artifactId>lib.search-model-api</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.ihe.gazelle</groupId> <groupId>net.ihe.gazelle</groupId>
<artifactId>lib.search-jpa-dao</artifactId> <artifactId>lib.search-jpa-dao</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.ihe.gazelle</groupId> <groupId>net.ihe.gazelle</groupId>
<artifactId>lib.gitb-utils</artifactId> <artifactId>lib.gitb-utils</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
......
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