summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2018-02-20 18:19:39 +0100
committerDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2018-02-20 18:19:39 +0100
commit373a9273031147e4034dfd0e530b3657ca709b5a (patch)
tree3e707ad4ec169ef8d30c04c7fd8a54d07109bcd4
parent6347e3fd0c2285d65992c03a3ae536957bfb46c8 (diff)
Fix issue with clamp.env
Clamp.env was wrong so clamp was crashing at runtime when accessing the db Issue-ID: CLAMP-85 Change-Id: I162b682fa9d4977218e3ebd48e210bf87d053698 Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
-rw-r--r--extra/docker/clamp/clamp.env5
-rw-r--r--pom.xml2
2 files changed, 2 insertions, 5 deletions
diff --git a/extra/docker/clamp/clamp.env b/extra/docker/clamp/clamp.env
index 41585aba1..9c724740a 100644
--- a/extra/docker/clamp/clamp.env
+++ b/extra/docker/clamp/clamp.env
@@ -1,4 +1 @@
-SPRING_APPLICATION_JSON={"spring.datasource.cldsdb.url":"jdbc:mariadb:sequential://db:3306/cldsdb4?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647",
-"org.onap.clamp.config.files.cldsPolicyConfig":"classpath:/clds/clds-policy-config.properties",
-"org.onap.clamp.config.files.cldsReference":"classpath:/clds/clds-reference.properties"
-} \ No newline at end of file
+SPRING_APPLICATION_JSON={"spring.datasource.cldsdb.url":"jdbc:mariadb:sequential://db:3306/cldsdb4?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647","org.onap.clamp.config.files.cldsPolicyConfig":"classpath:/clds/clds-policy-config.properties","org.onap.clamp.config.files.cldsReference":"classpath:/clds/clds-reference.properties"} \ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3a482dd0d..192d35bd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -468,7 +468,7 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>2.1.1</version>
+ <version>2.2.1</version>
</dependency>
</dependencies>