diff options
| author |   Timoney, Dan (dt5972) <dt5972@att.com> | 2018-09-12 16:17:29 -0400 |
|---|---|---|
| committer | Dan Timoney <dt5972@att.com> | 2018-09-13 15:04:49 +0000 |
| commit | 9c5b490046af60a83fd02dde5a91e68259d8b06a (patch) | |
| tree | 3473135c1a41d393c2529a6d48663791852841d6 /ms | |
| parent | 74896075be266b6f974eb9e1042ca7c6b5ed70db (diff) | |
Use mariadb JDBC connector
To resolve license issues, use mariadb JDBC connector
Change-Id: I9c953e27b69fbd33fa715cfc3917af7991a23457
Issue-ID: CCSDK-559
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
Diffstat (limited to 'ms')
| -rw-r--r-- | ms/neng/.classpath | 21 | ||||
| -rw-r--r-- | ms/neng/pom.xml | 10 | ||||
| -rw-r--r-- | ms/vlantag-api/pom.xml | 8 |
3 files changed, 12 insertions, 27 deletions
diff --git a/ms/neng/.classpath b/ms/neng/.classpath index 1272921b..760fe4ae 100644 --- a/ms/neng/.classpath +++ b/ms/neng/.classpath @@ -6,22 +6,12 @@ <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry kind="src" output="target-ide/classes" path="opt/etc/config"> + <classpathentry excluding="**" kind="src" output="target-ide/classes" path="opt/etc/config"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry kind="src" output="target-ide/classes" path="opt/etc/keystore"> - <attributes> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="src" output="target-ide/classes" path="opt/etc/truststore"> - <attributes> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="src" output="target-ide/classes" path="src/main/resources"> + <classpathentry excluding="**" kind="src" output="target-ide/classes" path="src/main/resources"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> @@ -32,12 +22,7 @@ <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry kind="src" output="target-ide/test-classes" path="src/test/resources"> - <attributes> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="src" output="target-ide/classes" path="opt/aai/keystore"> + <classpathentry excluding="**" kind="src" output="target-ide/test-classes" path="src/test/resources"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml index 0c5832a8..87ac192e 100644 --- a/ms/neng/pom.xml +++ b/ms/neng/pom.xml @@ -260,11 +260,11 @@ <groupId>org.liquibase</groupId> <artifactId>liquibase-core</artifactId> </dependency> - <dependency> - <groupId>org.wisdom-framework</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.1.34_1</version> - </dependency> + <dependency> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <version>${mariadb.connector.version}</version> + </dependency> <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> diff --git a/ms/vlantag-api/pom.xml b/ms/vlantag-api/pom.xml index 63036401..3770aa27 100644 --- a/ms/vlantag-api/pom.xml +++ b/ms/vlantag-api/pom.xml @@ -17,7 +17,7 @@ <swagger.annotations.version>1.5.8</swagger.annotations.version> <java.version>1.8</java.version> <springboot.version>2.0.4.RELEASE</springboot.version> - <mysql.connector.version>5.1.46</mysql.connector.version> + <mariadb.connector.version>2.1.1</mariadb.connector.version> <ccsdk.sli.adaptors.version>0.3.0-SNAPSHOT</ccsdk.sli.adaptors.version> <docker.registry>TBD:5100</docker.registry> <serviceArtifactName>vlantagapi</serviceArtifactName> @@ -86,9 +86,9 @@ </dependency> <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.1.46</version> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <version>${mariadb.connector.version}</version> </dependency> <dependency> |