summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-09-18 11:59:15 -0400
committerDan Timoney <dtimoney@att.com>2017-09-18 11:59:15 -0400
commitec8e4d83e62f28955491ad1a51104c7ff01d7b5b (patch)
tree09e5e5ab01afb1cca9f753be1d415ad3d6d93803
parent794fd831e61cb41f13af329b1ca5b9bf38cd72b2 (diff)
Use mariadb JDBC connector
Update CCSDK container to use MariaDB JDBC connector instead of mysql connector. This is needed to resolve licensing issue. Both connectors are compatible with both MySQL and MariaDB back end databases, but mysql JDBC connector is licensed under GPL 2.0, while MariaDB JDBC is licensed under LGPL 2.0. Change-Id: I919e8463c1e0ef162b9becc5023ebf623423df78 Issue-ID: CCSDK-95 Signed-off-by: Dan Timoney <dtimoney@att.com>
-rw-r--r--odlsli/src/main/properties/dblib.properties2
-rw-r--r--opendaylight/pom.xml23
-rw-r--r--opendaylight/src/main/docker/Dockerfile4
3 files changed, 14 insertions, 15 deletions
diff --git a/odlsli/src/main/properties/dblib.properties b/odlsli/src/main/properties/dblib.properties
index 6a8dc793..d6d9f34e 100644
--- a/odlsli/src/main/properties/dblib.properties
+++ b/odlsli/src/main/properties/dblib.properties
@@ -24,7 +24,7 @@ org.onap.ccsdk.sli.dbtype=jdbc
org.onap.ccsdk.sli.jdbc.hosts=sdnctldb01
org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl
-org.openecomp.sdnc.sli.jdbc.driver=com.mysql.jdbc.Driver
+org.openecomp.sdnc.sli.jdbc.driver=org.mariadb.jdbc.Driver
org.onap.ccsdk.sli.jdbc.database=sdnctl
org.onap.ccsdk.sli.jdbc.user=sdnctl
org.onap.ccsdk.sli.jdbc.password=gamma
diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index 5924cba0..1061bbb7 100644
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -20,7 +20,7 @@
<image.name>onap/ccsdk-odl-image</image.name>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
<ccsdk.opendaylight.version>0.6.1-Carbon</ccsdk.opendaylight.version>
- <ccsdk.mysql-connector-java.version>5.1.39</ccsdk.mysql-connector-java.version>
+ <ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
</properties>
@@ -33,9 +33,9 @@
<type>tar.gz</type>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${ccsdk.mysql-connector-java.version}</version>
+ <groupId>org.mariadb.jdbc</groupId>
+ <artifactId>mariadb-java-client</artifactId>
+ <version>${ccsdk.mariadb-connector-java.version}</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -59,14 +59,14 @@
println project.properties['ccsdk.project.version'];
def versionArray;
if (project.properties['ccsdk.project.version'] != null ) {
- versionArray = project.properties['ccsdk.project.version'].split('\\.');
+ versionArray = project.properties['ccsdk.project.version'].split('\\.');
}
if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT"))
{
- project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+ project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
} else {
- project.properties['project.docker.latesttag.version']=versionArray[0]+ '.' + versionArray[1] +"-STAGING-latest";
+ project.properties['project.docker.latesttag.version']=versionArray[0]+'.' + versionArray[1]+"-STAGING-latest";
}
println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];
@@ -115,7 +115,7 @@
<version>3.0.0</version>
<executions>
<execution>
- <id>get-mysql-connector-jar</id>
+ <id>get-mariadb-connector-jar</id>
<phase>validate</phase>
<goals>
<goal>copy</goal>
@@ -123,11 +123,10 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${ccsdk.mysql-connector-java.version}</version>
+ <groupId>org.mariadb.jdbc</groupId>
+ <artifactId>mariadb-java-client</artifactId>
+ <version>${ccsdk.mariadb-connector-java.version}</version>
<type>jar</type>
-
<overWrite>true</overWrite>
<outputDirectory>${basedir}/target/docker-stage</outputDirectory>
</artifactItem>
diff --git a/opendaylight/src/main/docker/Dockerfile b/opendaylight/src/main/docker/Dockerfile
index 35d1277b..afa912b2 100644
--- a/opendaylight/src/main/docker/Dockerfile
+++ b/opendaylight/src/main/docker/Dockerfile
@@ -13,7 +13,7 @@ RUN mkdir /opt/opendaylight \
# workaround till we get proxy working
-RUN mkdir -p /opt/opendaylight/current/system/mysql/mysql-connector-java/${ccsdk.mysql-connector-java.version}
-COPY mysql-connector-java-${ccsdk.mysql-connector-java.version}.jar /opt/opendaylight/current/system/mysql/mysql-connector-java/${ccsdk.mysql-connector-java.version}
+RUN mkdir -p /opt/opendaylight/current/system/org/mariadb/jdbc/mariadb-java-client/${ccsdk.mariadb-connector-java.version}
+COPY mariadb-java-client-${ccsdk.mysql-connector-java.version}.jar /opt/opendaylight/current/system/org/mariadb/jdbc/mariadb-java-client/${ccsdk.mariadb-connector-java.version}
# ENTRYPOINT exec /opt/opendaylight/current/bin/karaf
EXPOSE 8181