nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-790 Fix postgres profile properties reading in pom file

This commit is contained in:
Martin Rojas Miguel Angel 2019-02-19 15:46:50 +01:00 committed by Holger Hagen
parent 0e8d6da605
commit a8792f6ec9
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ci/prepare_db.bat
View File

@ -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 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 jdbcDriver=com.ibm.db2.jcc.DB2Driver> %PROP_FILE%
ECHO jdbcUrl=jdbc:db2://localhost:50100/tskdb >> %PROP_FILE% ECHO jdbcUrl=jdbc:db2://localhost:50100/tskdb>> %PROP_FILE%
ECHO dbUserName=db2inst1 >> %PROP_FILE% ECHO dbUserName=db2inst1>> %PROP_FILE%
ECHO dbPassword=db2inst1-pwd >> %PROP_FILE% ECHO dbPassword=db2inst1-pwd>> %PROP_FILE%
ECHO schemaName=taskana >> %PROP_FILE% ECHO schemaName=taskana>> %PROP_FILE%
ECHO --- ECHO ---
GOTO MENU 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 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 jdbcDriver=com.ibm.db2.jcc.DB2Driver> %PROP_FILE%
ECHO jdbcUrl=jdbc:db2://localhost:50101/tskdb >> %PROP_FILE% ECHO jdbcUrl=jdbc:db2://localhost:50101/tskdb>> %PROP_FILE%
ECHO dbUserName=db2inst1 >> %PROP_FILE% ECHO dbUserName=db2inst1>> %PROP_FILE%
ECHO dbPassword=db2inst1-pwd >> %PROP_FILE% ECHO dbPassword=db2inst1-pwd>> %PROP_FILE%
ECHO schemaName=taskana >> %PROP_FILE% ECHO schemaName=taskana>> %PROP_FILE%
ECHO --- ECHO ---
GOTO MENU 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 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 jdbcDriver=org.postgresql.Driver> %PROP_FILE%
ECHO jdbcUrl=jdbc:postgresql://localhost:50102/postgres >> %PROP_FILE% ECHO jdbcUrl=jdbc:postgresql://localhost:50102/postgres>> %PROP_FILE%
ECHO dbUserName=postgres >> %PROP_FILE% ECHO dbUserName=postgres>> %PROP_FILE%
ECHO dbPassword=postgres >> %PROP_FILE% ECHO dbPassword=postgres>> %PROP_FILE%
ECHO schemaName=taskana >> %PROP_FILE% ECHO schemaName=taskana>> %PROP_FILE%
ECHO --- ECHO ---
GOTO MENU GOTO MENU

18
rest/taskana-rest-spring-wildfly-example/pom.xml
View File

@ -66,12 +66,20 @@
<activation> <activation>
<activeByDefault>false</activeByDefault> <activeByDefault>false</activeByDefault>
</activation> </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> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId> <artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-2</version> <version>1.0.0</version>
<executions> <executions>
<execution> <execution>
<phase>initialize</phase> <phase>initialize</phase>
@ -79,14 +87,6 @@
<goal>read-project-properties</goal> <goal>read-project-properties</goal>
</goals> </goals>
<configuration> <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> <files>
<file>${user.home}/taskanaUnitTest.properties</file> <file>${user.home}/taskanaUnitTest.properties</file>
</files> </files>