RM-6349 Minor changes over properties in parent pom and in community pom

This commit is contained in:
Elena Hardon
2018-06-11 14:28:21 +03:00
parent 49f1f75884
commit 8e93a8ff81
2 changed files with 3 additions and 4 deletions

View File

@@ -358,7 +358,7 @@
<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>
<postgres.port>5432</postgres.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>

View File

@@ -25,7 +25,6 @@
<alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version> <alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version>
<alfresco.rm.artifactId>alfresco-rm-community-repo</alfresco.rm.artifactId> <alfresco.rm.artifactId>alfresco-rm-community-repo</alfresco.rm.artifactId>
<alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version> <alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version>
<alfresco.mysql.version>5.1.31</alfresco.mysql.version>
<skip.integrationtests>true</skip.integrationtests> <skip.integrationtests>true</skip.integrationtests>
<!-- 6.0 changes --> <!-- 6.0 changes -->
@@ -140,7 +139,7 @@
<name>postgres:9.4.12</name> <name>postgres:9.4.12</name>
<run> <run>
<ports> <ports>
<port>${postgres.port}:${postgres.port}</port> <port>${postgresql.port}:${postgresql.port}</port>
</ports> </ports>
<env> <env>
<POSTGRES_PASSWORD>${alfresco.db.password}</POSTGRES_PASSWORD> <POSTGRES_PASSWORD>${alfresco.db.password}</POSTGRES_PASSWORD>
@@ -182,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:${postgres.port}/${alfresco.test.db.name}</db.url> <db.url>jdbc:postgresql://localhost:${postgresql.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>