X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=opendaylight%2Fpom.xml;h=1061bbb70e3c3d617f0190cd2fbd8342a01c3174;hb=85287c1aceef703e37e7ffd388ac6c8f3272fcf6;hp=9de65fd0e572b98b0372c2cc2cf20f6d125863bf;hpb=24a1a1b4a46330e9c5fa54ddabe3d01c3c60571f;p=ccsdk%2Fdistribution.git
diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index 9de65fd0..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
@@ -58,106 +58,64 @@
+
+
- io.fabric8
- docker-maven-plugin
- 0.16.5
- false
-
-
-
- ${image.name}
-
- try
- ${basedir}/target/docker-stage
- ${basedir}/target/docker-stage/Dockerfile
-
- ${project.version}
- ${project.version}-STAGING-${maven.build.timestamp}
- ${project.docker.latesttag.version}
-
-
-
-
-
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 3.0.0
- generate-images
- package
+ get-odl-distribution
+ validate
- build
+ copy
-
+
+
+
+ org.opendaylight.integration
+ distribution-karaf
+ ${ccsdk.opendaylight.version}
+ tar.gz
-
- push-images
- deploy
-
- build
- push
-
+ true
+ ${basedir}/target/docker-stage
+
+
+ false
+ true
+ true
+
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 3.0.0
-
-
- get-odl-distribution
- validate
-
- copy
-
-
-
-
- org.opendaylight.integration
- distribution-karaf
- ${ccsdk.opendaylight.version}
- tar.gz
-
- true
- ${basedir}/target/docker-stage
-
-
- false
- true
- true
-
-
-
-
-
org.apache.maven.plugins
maven-dependency-plugin
3.0.0
- get-mysql-connector-jar
+ get-mariadb-connector-jar
validate
copy
@@ -165,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
@@ -213,6 +170,59 @@
+
+
+
+ docker
+
+
+
+ io.fabric8
+ docker-maven-plugin
+ 0.16.5
+ false
+
+
+
+ ${image.name}
+
+ try
+ ${basedir}/target/docker-stage
+ ${basedir}/target/docker-stage/Dockerfile
+
+ ${project.version}
+ ${project.version}-STAGING-${maven.build.timestamp}
+ ${project.docker.latesttag.version}
+
+
+
+
+
+
+
+ generate-images
+ package
+
+ build
+
+
+
+
+ push-images
+ deploy
+
+ build
+ push
+
+
+
+
+
+
+
+
+
+
openECOMP