Merge branch 'master' into 'develop'

Master

See merge request gazelle/library/gazelle-tm-tools!8

.gitlab-ci.yml

@@ -20,16 +20,15 @@ variables:
   P_APP_TYPE: "java"
   P_CODE_SRC_PATH: "."
   P_MAVEN_IMAGE_TAG: "3.6.3-jdk-8"
+  POSTGRES_DB: "gazelle-junit"
+  POSTGRES_USER: "gazelle"
+  POSTGRES_PASSWORD: "gazelle"
 
 # Define jobs
 code:
   stage: build
   extends:
     - .buildCodeForJavaWithPostgresql
-  variables:
-    POSTGRES_DB: "gazelle-junit"
-    POSTGRES_USER: "${POSTGRES_USER}"
-    POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
 
 quality:
   stage: tests
@@ -40,7 +39,3 @@ release/code:
   stage: release
   extends:
     - .releaseCodeForJavaWithPostgresql
-  variables:
-    POSTGRES_DB: "gazelle-junit"
-    POSTGRES_USER: "${POSTGRES_USER}"
-    POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"

pom.xml

@@ -11,7 +11,7 @@
     <packaging>ejb</packaging>
     <url>http://gazelle.ihe.net</url>
     <name>gazelle-tm-tools</name>
-    <version>4.1.3-SNAPSHOT</version>
+    <version>4.1.4-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>