diff options
| author |   Gao Weitao <victor.gao@huawei.com> | 2018-03-02 07:44:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-02 07:44:49 +0000 |
| commit | 3b2bf284d5ea5ecd81891442c3ea16a6280961ba (patch) | |
| tree | f335368321cc25638547e45dcc68b3aa8a98499f | |
| parent | 48f249950e178b30653f020c3ea0f845cf84c0c5 (diff) | |
| parent | 52e70a5feb03217cbacd6a54a0aff3f0034a89fd (diff) | |
Merge "Replace mysql connector with MariaDB connector"
| -rw-r--r-- | ResmanagementService/service/pom.xml | 7 | ||||
| -rw-r--r-- | ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ResmanagementService/service/pom.xml b/ResmanagementService/service/pom.xml index 383e966..e6a3a3e 100644 --- a/ResmanagementService/service/pom.xml +++ b/ResmanagementService/service/pom.xml @@ -80,11 +80,18 @@ <artifactId>jetty-all</artifactId> <version>8.1.16.v20140903</version> </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> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> diff --git a/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml b/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml index 95c9020..e60bf19 100644 --- a/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml +++ b/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml @@ -44,8 +44,8 @@ <bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJsonProvider" /> <bean id="source" class="org.springframework.jdbc.datasource.DriverManagerDataSource"> - <property name="driverClassName" value="com.mysql.jdbc.Driver"/> - <property name="url" value="jdbc:mysql://127.0.0.1:3306/resmanagementdb"/> + <property name="driverClassName" value="org.mariadb.jdbc.Driver"/> + <property name="url" value="jdbc:mariadb://127.0.0.1:3306/resmanagementdb"/> <property name="username" value="root"/> <property name="password" value="rootpass"/> </bean> |