<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>distribution-opendaylight</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
<name>Distribution - opendaylight</name>
<description>Creates OpenDaylight container</description>
<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>
<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>
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"))
+ if (project.properties['ccsdk.project.version'].endsWith("-amsterdam"))
{
- 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'];
<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>
<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>