Fix concurrent build

Fix concurrent build issue that may occur and generate random ports
automatically in the build

Issue-ID: CLAMP-252
Change-Id: If1b67a3a03fea52971b494621a4ba3ba44ee6a01
Signed-off-by: sebdet <sebastien.determe@intl.att.com>

3 files changed, 3 insertions, 3 deletions

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 28779af5..ef4c4fcb 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -99,7 +99,7 @@ camel.springboot.xmlRests=classpath:/clds/camel/rest/*.xml
 
 #clds datasource connection details
 spring.datasource.cldsdb.driverClassName=org.mariadb.jdbc.Driver
-spring.datasource.cldsdb.url=jdbc:mariadb:sequential://localhost:${docker.mariadb.port.host}/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3
+spring.datasource.cldsdb.url=jdbc:mariadb:sequential://localhost:3306/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3
 spring.datasource.cldsdb.username=clds
 spring.datasource.cldsdb.password=4c90a0b48204383f4283448d23e0b885a47237b2a23588e7c4651604f51c1067
 spring.datasource.cldsdb.validationQuery=SELECT 1
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index 8d6cd384..7116940f 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -30,7 +30,7 @@ info.build.version=@project.version@
 ### (See below for the parameter 'server.http.port' if you want to have both enabled)

 ### To have only HTTP, keep the lines server.ssl.* commented

 ### To have only HTTPS enabled, uncomment the server.ssl.* lines and specify a right keystore location

-server.port=8080

+server.port=${clamp.it.tests.http}

 ### Settings for HTTPS (this automatically enables the HTTPS on the port 'server.port')

 #server.ssl.key-store=file:/tmp/mykey.jks

 #server.ssl.key-store-password=pass

diff --git a/src/test/resources/https/https-test.properties b/src/test/resources/https/https-test.properties
index e15ea6ed..34b7222e 100644
--- a/src/test/resources/https/https-test.properties
+++ b/src/test/resources/https/https-test.properties
@@ -25,7 +25,7 @@
 ### (See below for the parameter 'server.http.port' if you want to have both enabled) 
 ### To have only HTTP, keep the lines server.ssl.* commented
 ### To have only HTTPS enabled, uncomment the server.ssl.* lines and specify a right keystore location
-server.port=10443
+server.port=${clamp.it.tests.https}
 ### Settings for HTTPS (this automatically enables the HTTPS on the port 'server.port') 
 server.ssl.key-store=classpath:https/keystore-test.jks
 server.ssl.key-store-password=testpass