aboutsummaryrefslogtreecommitdiffstats
path: root/appc-dispatcher/appc-dispatcher-common
diff options
context:
space:
mode:
authorPatrick Brady <pb071s@att.com>2017-09-13 00:11:21 -0700
committerPatrick Brady <pb071s@att.com>2017-09-15 06:32:10 +0000
commitac62a4a52bad0f0c5d3b3a0de39893f6993a9f1b (patch)
tree3d1e90bf4df8019582452f9cd597fd72160d0ecd /appc-dispatcher/appc-dispatcher-common
parent4f2ed4e9515f416cab0e75af33b8d799c02974f1 (diff)
Changing to mariadb java client
Changing from the mysql java connector to the mariadb java client. Change-Id: I2f9b1f5da37424d529e196f9b6b8d0bf4f1f9d2f Signed-off-by: Patrick Brady <pb071s@att.com> Issue-id: APPC-198
Diffstat (limited to 'appc-dispatcher/appc-dispatcher-common')
-rw-r--r--appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml6
-rw-r--r--appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DBUtils.java4
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/pom.xml7
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/MySqlConnectionFactory.java2
4 files changed, 10 insertions, 9 deletions
diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml
index a074f9bcf..c0c77d980 100644
--- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml
+++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml
@@ -36,6 +36,10 @@
<artifactId>appc-common</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.mariadb.jdbc</groupId>
+ <artifactId>mariadb-java-client</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -48,7 +52,7 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>org.openecomp.appc.dao.util</Export-Package>
<Import-Package>org.openecomp.appc.configuration,*;resolution:=optional</Import-Package>
- <Embed-Dependency>mysql-connector-java</Embed-Dependency>
+ <Embed-Dependency>mariadb-java-client</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DBUtils.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DBUtils.java
index 49e424188..c4b788057 100644
--- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DBUtils.java
+++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DBUtils.java
@@ -31,7 +31,7 @@ import org.openecomp.appc.configuration.ConfigurationFactory;
@Deprecated
public class DBUtils {
- private static final String JDBC_DRIVER = "com.mysql.jdbc.Driver";
+ private static final String JDBC_DRIVER = "org.mariadb.jdbc.Driver";
private static final Configuration configuration = ConfigurationFactory.getConfiguration();
static {
try {
@@ -43,7 +43,7 @@ public class DBUtils {
}
public static Connection getConnection(String schema) throws SQLException {
- DriverManager.registerDriver(new com.mysql.jdbc.Driver());
+ DriverManager.registerDriver(new org.mariadb.jdbc.Driver());
String dbURL = configuration.getProperty(String.format("org.openecomp.appc.db.url.%s", schema), "");
String userName = configuration.getProperty(String.format("org.openecomp.appc.db.user.%s", schema), "");
String password = configuration.getProperty(String.format("org.openecomp.appc.db.pass.%s", schema), "");
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/pom.xml b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/pom.xml
index 3c1c483ad..de33fa90a 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/pom.xml
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/pom.xml
@@ -18,11 +18,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql.connector.version}</version>
- <type>jar</type>
- <scope>provided</scope>
+ <groupId>org.mariadb.jdbc</groupId>
+ <artifactId>mariadb-java-client</artifactId>
</dependency>
<dependency>
<groupId>org.openecomp.appc</groupId>
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/MySqlConnectionFactory.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/MySqlConnectionFactory.java
index e97a54ba8..c9af310e7 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/MySqlConnectionFactory.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/MySqlConnectionFactory.java
@@ -32,6 +32,6 @@ import org.openecomp.appc.dao.util.DefaultJdbcConnectionFactory;
public class MySqlConnectionFactory extends DefaultJdbcConnectionFactory {
protected void registedDriver() throws SQLException {
- DriverManager.registerDriver(new com.mysql.jdbc.Driver());
+ DriverManager.registerDriver(new org.mariadb.jdbc.Driver());
}
}