update sdnc-web image

[sdnc/oam.git] / installation / sdnc-web / pom.xml

diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml
index 8e44975..b06ca00 100644 (file)
--- a/installation/sdnc-web/pom.xml
+++ b/installation/sdnc-web/pom.xml
@@ -20,9 +20,8 @@
         <base.image.repo>docker.io/bitnami/nginx:1.16-debian-9</base.image.repo>
         <image.name>onap/sdnc-web-image</image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
+        <ccsdk.features.version>1.0.1-SNAPSHOT</ccsdk.features.version>
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
-        <ccsdk.groupId>org.onap.ccsdk.features.sdnr.wt</ccsdk.groupId>
-        <ccsdk.features.version>1.0.0</ccsdk.features.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
         <docker.push.phase>deploy</docker.push.phase>
@@ -32,19 +31,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-            <artifactId>sdnr-wt-odlux-framework</artifactId>
-            <version>${ccsdk.features.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-            <artifactId>sdnr-wt-odlux-apps-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
-            <type>zip</type>
-            <classifier>repo</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-            <artifactId>sdnr-wt-helpserver-installer</artifactId>
+            <artifactId>sdnr-wt-odlux-installer</artifactId>
             <version>${ccsdk.features.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
@@ -141,141 +128,14 @@
                         <id>unpack features</id>
                         <phase>generate-sources</phase>
                         <goals>
-                            <goal>unpack</goal>
+                            <goal>unpack-dependencies</goal>
                         </goals>
-
                         <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>${ccsdk.groupId}</groupId>
-                                    <artifactId>sdnr-wt-odlux-framework</artifactId>
-                                    <version>${ccsdk.features.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                    <includes>odlux/**</includes>
-                                </artifactItem>
-                                <!-- connectApp -->
-                                <artifactItem>
-                                    <groupId>${ccsdk.groupId}</groupId>
-                                    <artifactId>sdnr-wt-odlux-app-connectApp</artifactId>
-                                    <version>${ccsdk.features.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                    <includes>odlux/**</includes>
-                                </artifactItem>
-                                <!-- eventLogApp -->
-                                <artifactItem>
-                                    <groupId>${ccsdk.groupId}</groupId>
-                                    <artifactId>sdnr-wt-odlux-app-eventLogApp</artifactId>
-                                    <version>${ccsdk.features.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                    <includes>odlux/**</includes>
-                                </artifactItem>
-                                <!-- helpApp -->
-                                <artifactItem>
-                                    <groupId>${ccsdk.groupId}</groupId>
-                                    <artifactId>sdnr-wt-odlux-app-helpApp</artifactId>
-                                    <version>${ccsdk.features.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                    <includes>odlux/**</includes>
-                                </artifactItem>
-                                <!-- maintenanceApp -->
-                                <artifactItem>
-                                    <groupId>${ccsdk.groupId}</groupId>
-                                    <artifactId>sdnr-wt-odlux-app-maintenanceApp</artifactId>
-                                    <version>${ccsdk.features.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                    <includes>odlux/**</includes>
-                                </artifactItem>
-                                <!-- minimumApp -->
-                                <artifactItem>
-                                    <groupId>${ccsdk.groupId}</groupId>
-                                    <artifactId>sdnr-wt-odlux-app-minimumApp</artifactId>
-                                    <version>${ccsdk.features.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                    <includes>odlux/**</includes>
-                                </artifactItem>
-                                <!-- configurationApp -->
-                                <artifactItem>
-                                    <groupId>${ccsdk.groupId}</groupId>
-                                    <artifactId>sdnr-wt-odlux-app-configurationApp</artifactId>
-                                    <version>${ccsdk.features.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                    <includes>odlux/**</includes>
-                                </artifactItem>
-                                <!-- demoApp -->
-                                <artifactItem>
-                                    <groupId>${ccsdk.groupId}</groupId>
-                                    <artifactId>sdnr-wt-odlux-app-demoApp</artifactId>
-                                    <version>${ccsdk.features.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                    <includes>odlux/**</includes>
-                                </artifactItem>
-                                <!-- faultApp -->
-                                <artifactItem>
-                                    <groupId>${ccsdk.groupId}</groupId>
-                                    <artifactId>sdnr-wt-odlux-app-faultApp</artifactId>
-                                    <version>${ccsdk.features.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                    <includes>odlux/*</includes>
-                                </artifactItem>
-                                <!-- inventoryApp -->
-                                <artifactItem>
-                                    <groupId>${ccsdk.groupId}</groupId>
-                                    <artifactId>sdnr-wt-odlux-app-inventoryApp</artifactId>
-                                    <version>${ccsdk.features.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                    <includes>odlux/**</includes>
-                                </artifactItem>
-                                <!-- mediatorApp -->
-                                <artifactItem>
-                                    <groupId>${ccsdk.groupId}</groupId>
-                                    <artifactId>sdnr-wt-odlux-app-mediatorApp</artifactId>
-                                    <version>${ccsdk.features.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                    <includes>odlux/**</includes>
-                                </artifactItem>
-                                <!-- performanceHistoryApp -->
-                                <artifactItem>
-                                    <groupId>${ccsdk.groupId}</groupId>
-                                    <artifactId>sdnr-wt-odlux-app-performanceHistoryApp</artifactId>
-                                    <version>${ccsdk.features.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                    <includes>odlux/**</includes>
-                                </artifactItem>
-                                <!-- helpserver resources -->
-                                <artifactItem>
-                                    <groupId>${ccsdk.groupId}</groupId>
-                                    <artifactId>sdnr-wt-helpserver-provider</artifactId>
-                                    <version>${ccsdk.features.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                    <includes>help/**</includes>
-                                </artifactItem>
-                            </artifactItems>
+                            <outputDirectory>${basedir}/target/docker-stage/html</outputDirectory>
+                            <excludeTransitive>true</excludeTransitive>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
                         </configuration>
                     </execution>
                 </executions>