summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorluxin <luxin7@huawei.com>2018-03-02 15:36:28 +0800
committerluxin <luxin7@huawei.com>2018-03-02 15:36:28 +0800
commita46e44967ef49c7c33ac09017c45808450870640 (patch)
tree8299bf2ec1ac822579ae8e47fb0673abe79c0fc4
parenta293a810aa963b23dfb6ec408c48f0b5510ab99c (diff)
Replace mysql connector with MariaDB connector
Change-Id: Ifa809b681a2f1f3485787aa4cb9789e811e58bd7 Issue-ID: VFC-725 Signed-off-by: luxin <luxin7@huawei.com>
-rw-r--r--juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml7
-rw-r--r--juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/resources/db.properties6
2 files changed, 11 insertions, 2 deletions
diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml
index c9e7c17..4895f1f 100644
--- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml
+++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml
@@ -199,11 +199,18 @@
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
+ <!--
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.36</version>
</dependency>
+ -->
+ <dependency>
+ <groupId>org.mariadb.jdbc</groupId>
+ <artifactId>mariadb-java-client</artifactId>
+ <version>2.2.2</version>
+ </dependency>
<!--authorization.filter -->
<dependency>
<groupId>org.jmockit</groupId>
diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/resources/db.properties b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/resources/db.properties
index 8f9dbb4..85407c4 100644
--- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/resources/db.properties
+++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/resources/db.properties
@@ -16,5 +16,7 @@
jdbc.username=root
jdbc.password=rootpass
-jdbc.url=jdbc:mysql://127.0.0.1:3306/jujuvnfmdb
-jdbc.driverClassName=com.mysql.jdbc.Driver \ No newline at end of file
+jdbc.url=jdbc:mariadb://127.0.0.1:3306/jujuvnfmdb
+jdbc.driverClassName=org.mariadb.jdbc.Driver
+#jdbc.url=jdbc:mysql://127.0.0.1:3306/jujuvnfmdb
+#jdbc.driverClassName=com.mysql.jdbc.Driver \ No newline at end of file