X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=opendaylight%2Fpom.xml;h=1061bbb70e3c3d617f0190cd2fbd8342a01c3174;hb=a2c2bd67323a35936d5f4ef9b3230e6c25e6a0c8;hp=5924cba077a9cd2e97f61ede1a097f1b2bb2497c;hpb=74e4e8dede50ffaf0d2209046959dea98b903c33;p=ccsdk%2Fdistribution.git
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 @@
onap/ccsdk-odl-image
${project.version}
0.6.1-Carbon
- 5.1.39
+ 2.1.1
${https_proxy}
@@ -33,9 +33,9 @@
tar.gz
- mysql
- mysql-connector-java
- ${ccsdk.mysql-connector-java.version}
+ org.mariadb.jdbc
+ mariadb-java-client
+ ${ccsdk.mariadb-connector-java.version}
jar
@@ -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 @@
3.0.0
- get-mysql-connector-jar
+ get-mariadb-connector-jar
validate
copy
@@ -123,11 +123,10 @@
- mysql
- mysql-connector-java
- ${ccsdk.mysql-connector-java.version}
+ org.mariadb.jdbc
+ mariadb-java-client
+ ${ccsdk.mariadb-connector-java.version}
jar
-
true
${basedir}/target/docker-stage