From a8792f6ec9f1401ec559027a05dc0a7b16aaaad7 Mon Sep 17 00:00:00 2001
From: Martin Rojas Miguel Angel <MiguelAngel.MartinRojas@novatec-gmbh.de>
Date: Tue, 19 Feb 2019 15:46:50 +0100
Subject: [PATCH] TSK-790 Fix postgres profile properties reading in pom file

---
 ci/prepare_db.bat                             | 30 +++++++++----------
 .../pom.xml                                   | 18 +++++------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/ci/prepare_db.bat b/ci/prepare_db.bat
index 43c6f977a..1e9a97464 100644
--- a/ci/prepare_db.bat
+++ b/ci/prepare_db.bat
@@ -50,11 +50,11 @@ SET PROP_FILE=%HOMEPATH%\taskanaUnitTest.properties
         docker run -d -p 50100:50000 --name taskana-db2_10_5 taskana/db2:10.5 -d
     )
 
-    ECHO jdbcDriver=com.ibm.db2.jcc.DB2Driver > %PROP_FILE%
-    ECHO jdbcUrl=jdbc:db2://localhost:50100/tskdb >> %PROP_FILE%
-    ECHO dbUserName=db2inst1 >> %PROP_FILE%
-    ECHO dbPassword=db2inst1-pwd >> %PROP_FILE%
-    ECHO schemaName=taskana >> %PROP_FILE%
+    ECHO jdbcDriver=com.ibm.db2.jcc.DB2Driver> %PROP_FILE%
+    ECHO jdbcUrl=jdbc:db2://localhost:50100/tskdb>> %PROP_FILE%
+    ECHO dbUserName=db2inst1>> %PROP_FILE%
+    ECHO dbPassword=db2inst1-pwd>> %PROP_FILE%
+    ECHO schemaName=taskana>> %PROP_FILE%
     ECHO ---
     GOTO MENU
 
@@ -83,11 +83,11 @@ SET PROP_FILE=%HOMEPATH%\taskanaUnitTest.properties
         docker run -d -p 50101:50000 --name taskana-db2_11_1 taskana/db2:11.1 -d
     )
 
-    ECHO jdbcDriver=com.ibm.db2.jcc.DB2Driver > %PROP_FILE%
-    ECHO jdbcUrl=jdbc:db2://localhost:50101/tskdb >> %PROP_FILE%
-    ECHO dbUserName=db2inst1 >> %PROP_FILE%
-    ECHO dbPassword=db2inst1-pwd >> %PROP_FILE%
-    ECHO schemaName=taskana >> %PROP_FILE%
+    ECHO jdbcDriver=com.ibm.db2.jcc.DB2Driver> %PROP_FILE%
+    ECHO jdbcUrl=jdbc:db2://localhost:50101/tskdb>> %PROP_FILE%
+    ECHO dbUserName=db2inst1>> %PROP_FILE%
+    ECHO dbPassword=db2inst1-pwd>> %PROP_FILE%
+    ECHO schemaName=taskana>> %PROP_FILE%
     ECHO ---
     GOTO MENU
 
@@ -116,11 +116,11 @@ SET PROP_FILE=%HOMEPATH%\taskanaUnitTest.properties
         docker run -d -p 50102:5432 --name taskana-postgres_10_4 -e POSTGRES_PASSWORD=postgres postgres:10.4
     )
 
-    ECHO jdbcDriver=org.postgresql.Driver > %PROP_FILE%
-    ECHO jdbcUrl=jdbc:postgresql://localhost:50102/postgres >> %PROP_FILE%
-    ECHO dbUserName=postgres >> %PROP_FILE%
-    ECHO dbPassword=postgres >> %PROP_FILE%
-    ECHO schemaName=taskana >> %PROP_FILE%
+    ECHO jdbcDriver=org.postgresql.Driver> %PROP_FILE%
+    ECHO jdbcUrl=jdbc:postgresql://localhost:50102/postgres>> %PROP_FILE%
+    ECHO dbUserName=postgres>> %PROP_FILE%
+    ECHO dbPassword=postgres>> %PROP_FILE%
+    ECHO schemaName=taskana>> %PROP_FILE%
     ECHO ---
     GOTO MENU
 
diff --git a/rest/taskana-rest-spring-wildfly-example/pom.xml b/rest/taskana-rest-spring-wildfly-example/pom.xml
index d2fec2a77..e694013e5 100644
--- a/rest/taskana-rest-spring-wildfly-example/pom.xml
+++ b/rest/taskana-rest-spring-wildfly-example/pom.xml
@@ -66,12 +66,20 @@
 			<activation>
 				<activeByDefault>false</activeByDefault>
 			</activation>
+			<properties>
+				<driver-class>${jdbcDriver}</driver-class>
+				<connection-url>${jdbcUrl}</connection-url>
+				<driver-name>postgresqldriver</driver-name>
+				<user-name>${dbUserName}</user-name>
+				<password>${dbPassword}</password>
+				<activatedProperties>postgres</activatedProperties>
+			</properties>
 			<build>
 				<plugins>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>properties-maven-plugin</artifactId>
-						<version>1.0-alpha-2</version>
+						<version>1.0.0</version>
 						<executions>
 							<execution>
 								<phase>initialize</phase>
@@ -79,14 +87,6 @@
 									<goal>read-project-properties</goal>
 								</goals>
 								<configuration>
-									<properties>
-										<driver-class>${jdbcDriver}</driver-class>
-										<connection-url>${jdbcUrl}</connection-url>
-										<driver-name>postgresqldriver</driver-name>
-										<user-name>${dbUserName}</user-name>
-										<password>${dbPassword}</password>
-										<activatedProperties>postgres</activatedProperties>
-									</properties>
 									<files>
 										<file>${user.home}/taskanaUnitTest.properties</file>
 									</files>