optimize size and time using "--no-cache-dir"
[appc/deployment.git] / installation / appc / pom.xml
index efaed22..999a191 100644 (file)
@@ -3,7 +3,7 @@
 ============LICENSE_START==========================================
 ONAP : APPC
 ===================================================================
-Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
 ===================================================================
 
 Unless otherwise specified, all software contained herein is licensed
@@ -26,26 +26,29 @@ limitations under the License.
        <parent>
                <groupId>org.onap.appc.deployment</groupId>
                <artifactId>installation</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
        <groupId>org.onap.appc.deployment</groupId>
        <artifactId>installation-appc</artifactId>
-       <version>1.3.0-SNAPSHOT</version>
+       <version>1.8.0-SNAPSHOT</version>
 
        <name>Installation - APPC Docker</name>
        <description>Creates APPC Docker container on top of the SDNC Base Docker Image</description>
 
        <properties>
                <image.name>onap/appc-image</image.name>
-               <appc.release.version>1.3.0</appc.release.version>
-               <appc.snapshot.version>1.3.0-SNAPSHOT</appc.snapshot.version>
+               <appc.release.version>1.7.1</appc.release.version>
+               <appc.snapshot.version>1.8.0-SNAPSHOT</appc.snapshot.version>
                 <!--This version will be over-ridden by jenkins 
                     injecting the version.properties variable file during docker build-->
                <appc.docker.staging.version>1.0.0</appc.docker.staging.version>
                <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+               <!--Determines the version of the cdt-proxy-service to download and install-->
+               <appc.cdt.version>1.7.1</appc.cdt.version>
+               <docker.plugin.version>0.28.0</docker.plugin.version>
        </properties>
 
 
@@ -109,10 +112,13 @@ limitations under the License.
                                                                <resource>
                                                                        <directory>src/main/resources</directory>
                                                                        <includes>
+                                                                               <include>keystore</include>
                                                                                <include>*.dump</include>
                                                                                <include>*.sh</include>
                                                                                <include>*.cfg</include>
                                                                                <include>*.xml</include>
+                                                                               <include>*.json</include>
+                                                                               <include>*.properties</include>
                                                                        </includes>
                                                                        <filtering>false</filtering>
                                                                </resource>
@@ -134,6 +140,7 @@ limitations under the License.
                                                                        <includes>
                                                                                <include>*.jks</include>
                                                                                <include>*.p12</include>
+                                                                               <include>*keyfile</include>
                                                                        </includes>
                                                                        <filtering>false</filtering>
                                                                </resource>
@@ -154,6 +161,7 @@ limitations under the License.
                                                                        <directory>../src/main/properties</directory>
                                                                        <includes>
                                                                                <include>*.properties</include>
+                                                                               <include>*.csv</include>
                                                                        </includes>
                                                                        <filtering>false</filtering>
                                                                </resource>
@@ -177,6 +185,7 @@ limitations under the License.
                                                        <executable>bash</executable>
                                                        <environmentVariables>
                                                                <APPC_VERSION>${appc.version}</APPC_VERSION>
+                                                               <APPC_CDT_VERSION>${appc.cdt.version}</APPC_CDT_VERSION>
                                                                <APPC_OAM_VERSION>${project.version}</APPC_OAM_VERSION>
                                                                <SDNC_OAM_VERSION>${project.version}</SDNC_OAM_VERSION>
                                                        </environmentVariables>
@@ -256,7 +265,7 @@ limitations under the License.
                                        <plugin>
                                                <groupId>io.fabric8</groupId>
                                                <artifactId>docker-maven-plugin</artifactId>
-                                               <version>0.16.5</version>
+                                               <version>${docker.plugin.version}</version>
                                                <inherited>false</inherited>
                                                <configuration>
                                                        <images>
@@ -265,7 +274,7 @@ limitations under the License.
                                                                        <build>
                                                                                <cleanup>try</cleanup>
                                                                                <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                                                               <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+                                                                               <dockerFile>Dockerfile</dockerFile>
                                                                                <tags>
                                                                                        <tag>${dockertag1}</tag>
                                                                                        <tag>${dockertag2}</tag>
@@ -352,10 +361,13 @@ limitations under the License.
                                                                                <resource>
                                                                                        <directory>src/main/resources</directory>
                                                                                        <includes>
+                                                                                               <include>keystore</include>
                                                                                                <include>*.dump</include>
                                                                                                <include>*.sh</include>
                                                                                                <include>*.cfg</include>
-                                                                                               <include>*.ini</include>                
+                                                                                               <include>*.xml</include>
+                                                                                               <include>*.json</include>
+                                                                                               <include>*.properties</include>
                                                                                        </includes>
                                                                                        <filtering>false</filtering>
                                                                                </resource>
@@ -377,6 +389,7 @@ limitations under the License.
                                                                                        <includes>
                                                                                                <include>*.jks</include>
                                                                                                <include>*.p12</include>
+                                                                                               <include>*.keyfile</include>
                                                                                        </includes>
                                                                                        <filtering>false</filtering>
                                                                                </resource>
@@ -397,6 +410,7 @@ limitations under the License.
                                                                                        <directory>../src/main/properties</directory>
                                                                                        <includes>
                                                                                                <include>*.properties</include>
+                                                                                               <include>*.csv</include>
                                                                                        </includes>
                                                                                        <filtering>false</filtering>
                                                                                </resource>