Make images arm-64 compatible

[ccsdk/distribution.git] / opendaylight / fluorine / fluorine-ubuntu / pom.xml

diff --git a/opendaylight/fluorine/fluorine-ubuntu/pom.xml b/opendaylight/fluorine/fluorine-ubuntu/pom.xml
index b1a9191..07ca5ee 100644 (file)
--- a/opendaylight/fluorine/fluorine-ubuntu/pom.xml
+++ b/opendaylight/fluorine/fluorine-ubuntu/pom.xml
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-odl-fluorine</artifactId>
-               <version>0.4.1-SNAPSHOT</version>
+               <version>0.4.2-SNAPSHOT</version>
        </parent>
 
        <artifactId>distribution-odl-fluorine-ubuntu</artifactId>
-       <version>0.4.1-SNAPSHOT</version>
+       <version>0.4.2-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: opendaylight :: ${project.artifactId}</name>
@@ -20,31 +20,8 @@
 
        <properties>
                <image.name>onap/ccsdk-odl-fluorine-ubuntu-image</image.name>
-               <ccsdk.project.version>${project.version}</ccsdk.project.version>
-               <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
-               <ccsdk.opendaylight.version>0.9.1</ccsdk.opendaylight.version>
-               <ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version>
-               <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
-               <docker.push.phase>deploy</docker.push.phase>
        </properties>
 
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.opendaylight.integration</groupId>
-                               <artifactId>karaf</artifactId>
-                               <version>${ccsdk.opendaylight.version}</version>
-                               <type>tar.gz</type>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.mariadb.jdbc</groupId>
-                               <artifactId>mariadb-java-client</artifactId>
-                               <version>${ccsdk.mariadb-connector-java.version}</version>
-                               <type>jar</type>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-
        <build>
                <plugins>
 
@@ -160,7 +137,7 @@
                                        <plugin>
                                                <groupId>io.fabric8</groupId>
                                                <artifactId>docker-maven-plugin</artifactId>
-                                               <version>0.16.5</version>
+                                               <version>0.28.0</version>
                                                <inherited>false</inherited>
                                                <configuration>
                                                        <images>
@@ -169,7 +146,7 @@
                                                                        <build>
                                                                                <cleanup>try</cleanup>
                                                                                <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                                                               <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+                                                                               <dockerFile>Dockerfile</dockerFile>
                                                                                <tags>
                                                                                        <tag>${project.docker.latestminortag.version}</tag>
                                                                                        <tag>${project.docker.latestfulltag.version}</tag>