diff options
| author |   Matthieu Geerebaert <matthieu.geerebaert@orange.com> | 2018-04-12 16:30:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-12 16:30:37 +0000 |
| commit | 47e9c488fbe0561872827a9b1a4dbe57a5623718 (patch) | |
| tree | 03f0cf717d5659d30cf70d94c976c8d8b284159b | |
| parent | 4c554bb94ecdd14415c8f9d8fd817c99c427c453 (diff) | |
| parent | 99b52b4268becc5c4fefdeac6877d12db568928b (diff) | |
Merge "Remove mysql-connector-java (license threat)"
| -rw-r--r-- | pom.xml | 4 | ||||
| -rw-r--r-- | src/main/resources/application-localhost.properties | 4 |
2 files changed, 2 insertions, 6 deletions
@@ -146,10 +146,6 @@ <!-- mysql --> <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - </dependency> - <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> <version>1.1.7</version> diff --git a/src/main/resources/application-localhost.properties b/src/main/resources/application-localhost.properties index 8470a93..bc4d56d 100644 --- a/src/main/resources/application-localhost.properties +++ b/src/main/resources/application-localhost.properties @@ -49,8 +49,8 @@ spring.data.mongodb.database=ServiceOrderDB # MYSQL spring.datasource.testWhileIdle=true spring.datasource.validationQuery=SELECT 1 -spring.datasource.driver-class-name=com.mysql.jdbc.Driver -spring.datasource.url=jdbc:mysql://localhost:3306/nbi +spring.datasource.driver-class-name=org.mariadb.jdbc.Driver +spring.datasource.url=jdbc:mariadb://localhost:3306/nbi spring.jpa.show-sql=false spring.datasource.username=root spring.datasource.password=toto |