X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=opendaylight%2Fpom.xml;h=f17187a9460be67fc7c4a66a216ab563dee92666;hb=bb108d7d8615a3568a499d086b8241b0d80a837e;hp=5924cba077a9cd2e97f61ede1a097f1b2bb2497c;hpb=74e4e8dede50ffaf0d2209046959dea98b903c33;p=ccsdk%2Fdistribution.git

diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index 5924cba0..f17187a9 100644
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <artifactId>distribution-opendaylight</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
+    <version>0.2.0-SNAPSHOT</version>
 
     <name>Distribution - opendaylight</name>
     <description>Creates OpenDaylight container</description>
@@ -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>