summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYan Yang <yangyanyj@chinamobile.com>2018-03-02 06:46:14 +0000
committerGerrit Code Review <gerrit@onap.org>2018-03-02 06:46:14 +0000
commit3903da6498bd24b4fdeabcb5b763bd6248297a97 (patch)
treeb95759c20fcbec76178bf61eb31a70b30038515e
parentc78cec3b24300037bcdd447328d516700182eab9 (diff)
parent7f850de916f192910ce609fab96bbc1a685caec1 (diff)
Merge "Replace mysql connector with MariaDB connector"
-rw-r--r--nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml22
-rw-r--r--nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/resources/application.properties6
2 files changed, 18 insertions, 10 deletions
diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml
index 08685b46..b7887a61 100644
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml
@@ -78,12 +78,12 @@
</exclusion>
</exclusions>
</dependency>
- -->
+
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
-<!--
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
@@ -95,17 +95,23 @@
<scope>provided</scope>
</dependency>
-->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
+
+ <dependency>
+ <groupId>org.mariadb.jdbc</groupId>
+ <artifactId>mariadb-java-client</artifactId>
+ <version>2.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.5</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/resources/application.properties b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/resources/application.properties
index 7ed68a98..2b870c0a 100644
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/resources/application.properties
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/resources/application.properties
@@ -24,11 +24,13 @@ spring.jackson.serialization.indent_output=false
#mybatis configuration
mybatis.type-aliases-package=org.onap.vfc.nfvo.driver.vnfm.svnfm.db.bean
-spring.datasource.driverClassName = com.mysql.jdbc.Driver
+#spring.datasource.driverClassName = com.mysql.jdbc.Driver
+spring.datasource.driverClassName = org.mariadb.jdbc.Driver
spring.datasource.username=vnfm
spring.datasource.password=vnfmpass
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/vnfm_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=round&useSSL=false
+#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/vnfm_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=round&useSSL=false
+spring.datasource.url=jdbc:mariadb://127.0.0.1:3306/vnfm_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=round&useSSL=false
#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
#spring.datasource.tomcat.max-wait=30000