X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fappc%2Fpom.xml;h=3cebf5e458dca91db1fd08bd45fb371607454f63;hb=2ad82140a88efa51cb7e9751d0b45cb0616f6b80;hp=db1cb67d09a8f0baedbf9befa65e01b571d74602;hpb=7f5d8f1fe6f8bdc761171661ec6088845e049a60;p=appc%2Fdeployment.git
diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml
index db1cb67..3cebf5e 100644
--- a/installation/appc/pom.xml
+++ b/installation/appc/pom.xml
@@ -3,23 +3,24 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- org.openecomp.appc.deployment
+ org.onap.appc.deployment
installation
- 1.1.0-SNAPSHOT
+ 1.3.0-SNAPSHOT
4.0.0
pom
- org.openecomp.appc.deployment
+ org.onap.appc.deployment
installation-appc
- 1.1.0-SNAPSHOT
+ 1.3.0-SNAPSHOT
Installation - APPC Docker
Creates APPC Docker container on top of the SDNC Base Docker Image
- openecomp/appc-image
- ${project.version}
+ onap/appc-image
+ 1.3.0
+ 1.3.0-SNAPSHOT
1.0.0
@@ -62,7 +63,7 @@
validate
- ${basedir}/target/docker-stage/opt/openecomp/appc/bin
+ ${basedir}/target/docker-stage/opt/onap/appc/bin
src/main/scripts
@@ -75,26 +76,27 @@
-
-
+
copy-properties
@@ -122,10 +125,10 @@
validate
- ${basedir}/target/docker-stage/opt/openecomp/appc/data/properties
+ ${basedir}/target/docker-stage/opt/onap/appc/data/properties
- ../src/main/appc-properties
+ ../src/main/properties
*.properties
@@ -156,7 +159,7 @@
${basedir}/src/main/scripts/installZips.sh
- ${basedir}/target/docker-stage/opt/openecomp/appc
+ ${basedir}/target/docker-stage/opt/onap/appc
@@ -170,7 +173,7 @@
find
- ${basedir}/target/docker-stage/opt/openecomp/appc
+ ${basedir}/target/docker-stage/opt/onap/appc
-name
*.sh
-exec
@@ -191,6 +194,42 @@
docker
+
+ org.codehaus.groovy.maven
+ gmaven-plugin
+
+
+ validate
+
+ execute
+
+
+
+ ${project.version}
+ ${maven.build.timestamp}
+
+
+ println project.properties['ver'];
+ def versionArray;
+ if ( project.properties['ver'] != null ) {
+ versionArray = project.properties['ver'].split('\\.');
+ }
+ if ( project.properties['ver'].endsWith("-SNAPSHOT") ) {
+ project.properties['dockertag1']=project.properties['ver'] + "-latest";
+ project.properties['dockertag2']="latest";
+ project.properties['appc.version']=project.properties['appc.snapshot.version'];
+ } else {
+ project.properties['dockertag1']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+ project.properties['dockertag2']=project.properties['ver'] + "-STAGING-" + project.properties['timestamp'];
+ project.properties['appc.version']=project.properties['appc.release.version'];
+ }
+ println 'docker tag 1: ' + project.properties['dockertag1'];
+ println 'docker tag 2: ' + project.properties['dockertag2'];
+
+
+
+
+
io.fabric8
docker-maven-plugin
@@ -205,8 +244,8 @@
${basedir}/target/docker-stage
${basedir}/target/docker-stage/Dockerfile
- ${appc.docker.staging.version}-STAGING-${maven.build.timestamp}
- ${release_name}.${sprint_number}-STAGING-latest
+ ${dockertag1}
+ ${dockertag2}
@@ -265,7 +304,7 @@
validate
- ${basedir}/target/docker-stage/opt/openecomp/appc/bin
+ ${basedir}/target/docker-stage/opt/onap/appc/bin
src/main/scripts
@@ -278,18 +317,47 @@
-
-
+
+ copy-data
+
+ copy-resources
+
+ validate
+
+ ${basedir}/target/docker-stage/opt/onap/appc/data
+
+
+ src/main/resources
+
+ *.dump
+ *.sh
+
+ false
+
+
+
+
+
+
+ copy-keystores
+
+ copy-resources
+
+ validate
+
+ ${basedir}/target/docker-stage/opt/onap/appc/data/stores
+
+
+ ../src/main/stores
+
+ *.jks
+ *.p12
+
+ false
+
+
+
+
copy-properties
@@ -298,10 +366,10 @@
validate
- ${basedir}/target/docker-stage/opt/openecomp/appc/data/properties
+ ${basedir}/target/docker-stage/opt/onap/appc/data/properties
- ../src/main/appc-properties
+ ../src/main/properties
*.properties
@@ -332,7 +400,7 @@
${basedir}/src/main/scripts/installZips.sh
- ${basedir}/target/docker-stage/opt/openecomp/appc
+ ${basedir}/target/docker-stage/opt/onap/appc
@@ -344,9 +412,9 @@
exec
- /usr/bin/find
+ find
- ${basedir}/target/docker-stage/opt/openecomp/appc
+ ${basedir}/target/docker-stage/opt/onap/appc
-name
*.sh
-exec
@@ -366,7 +434,7 @@
- openECOMP
+ ONAP