RM-6349 Small fixes over the fabric8 plugin

This commit is contained in:
Elena Hardon
2018-06-12 11:09:47 +03:00
parent ebe9e9b6f2
commit f9e2425e21
2 changed files with 4 additions and 3 deletions

View File

@@ -358,9 +358,10 @@
<fabric8.version>0.25.0</fabric8.version> <fabric8.version>0.25.0</fabric8.version>
<mockito.version>1.10.19</mockito.version> <mockito.version>1.10.19</mockito.version>
<postgresql.version>42.2.1</postgresql.version> <postgresql.version>42.2.1</postgresql.version>
<postgresql.port>32000</postgresql.port> <postgresql.port>5432</postgresql.port>
<mysql.version>5.1.40</mysql.version> <mysql.version>5.1.40</mysql.version>
<mysql.port>3306</mysql.port> <mysql.port>3306</mysql.port>
<database.port>5431</database.port>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

View File

@@ -139,7 +139,7 @@
<name>postgres:9.4.12</name> <name>postgres:9.4.12</name>
<run> <run>
<ports> <ports>
<port>${postgresql.port}:5432</port> <port>${database.port}:${postgresql.port}</port>
</ports> </ports>
<env> <env>
<POSTGRES_PASSWORD>${alfresco.db.password}</POSTGRES_PASSWORD> <POSTGRES_PASSWORD>${alfresco.db.password}</POSTGRES_PASSWORD>
@@ -181,7 +181,7 @@
<systemPropertyVariables> <systemPropertyVariables>
<db.name>${alfresco.test.db.name}</db.name> <db.name>${alfresco.test.db.name}</db.name>
<db.driver>org.postgresql.Driver</db.driver> <db.driver>org.postgresql.Driver</db.driver>
<db.url>jdbc:postgresql://localhost:${postgresql.port}/${alfresco.test.db.name}</db.url> <db.url>jdbc:postgresql://localhost:${database.port}/${alfresco.test.db.name}</db.url>
<dir.root>${project.build.directory}/alf-data-test</dir.root> <dir.root>${project.build.directory}/alf-data-test</dir.root>
</systemPropertyVariables> </systemPropertyVariables>
</configuration> </configuration>