X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fsdnc-web%2Fpom.xml;h=921293fc941f705ffdcbbc3b7080d9d0c6c03f82;hb=9720e30699bb2d9e4cb7c0f4a7b7b94eb3ce4b1f;hp=8e4497529b922e4c9bec5ebb64f8cfe3f40a61f2;hpb=eef450e6f6c80c5d39517b0c84b9b5e01b5e65ae;p=sdnc%2Foam.git

diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml
index 8e449752..921293fc 100644
--- a/installation/sdnc-web/pom.xml
+++ b/installation/sdnc-web/pom.xml
@@ -5,46 +5,28 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>installation</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.5.4-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-sdnc-web</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates SDN Controller WebUI Docker container</description>
 
     <properties>
-        <base.image.repo>docker.io/bitnami/nginx:1.16-debian-9</base.image.repo>
+        <base.image.repo>docker.io/bitnami/nginx:1.21-debian-10</base.image.repo>
         <image.name>onap/sdnc-web-image</image.name>
         <sdnc.project.version>${project.version}</sdnc.project.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>
-        <docker.verbose>true</docker.verbose>
     </properties>
 
     <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>
@@ -54,9 +36,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <version>1.0</version>
+                <groupId>org.codehaus.gmaven</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
+                <version>2.1.1</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
@@ -77,7 +59,7 @@
                         <id>copy-dockerfile</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals>                        <!-- here the phase you need -->
+                        </goals>
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
@@ -96,27 +78,27 @@
                         <id>copy-siteconf</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals>                        <!-- here the phase you need -->
+                        </goals>
                         <phase>validate</phase>
                         <configuration>
-                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                            <outputDirectory>${basedir}/target/docker-stage/conf</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>src/main/resources</directory>
                                     <includes>
                                         <include>*.conf</include>
+                                        <include>*.rules</include>
                                     </includes>
                                     <filtering>true</filtering>
                                 </resource>
                             </resources>
                         </configuration>
                     </execution>
-
                     <execution>
                         <id>copy-scripts</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals>                        <!-- here the phase you need -->
+                        </goals>
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage/bin</outputDirectory>
@@ -125,12 +107,33 @@
                                     <directory>src/main/scripts</directory>
                                     <includes>
                                         <include>*.sh</include>
+                                        <include>*.py</include>
                                     </includes>
                                     <filtering>true</filtering>
                                 </resource>
                             </resources>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy-favicon</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage/html</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>favicon.ico</include>
+                                        <include>odlux.application.list</include>
+                                    </includes>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -141,141 +144,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>
@@ -283,7 +159,7 @@
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>0.16.5</version>
+                <version>0.34.0</version>
                 <inherited>false</inherited>
                 <configuration>
                     <images>
@@ -291,8 +167,9 @@
                             <name>${image.name}</name>
                             <build>
                                 <cleanup>try</cleanup>
-                                <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+                                <noCache>true</noCache>
+                                <contextDir>${basedir}/target/docker-stage</contextDir>
+                                <dockerFile>Dockerfile</dockerFile>
                                 <tags>
                                     <tag>${project.docker.latestminortag.version}</tag>
                                     <tag>${project.docker.latestfulltag.version}</tag>
@@ -301,18 +178,12 @@
                             </build>
                         </image>
                     </images>
+                    <verbose>${docker.verbose}</verbose>
+                    <skipPush>${docker.skip.push}</skipPush>
                 </configuration>
                 <executions>
                     <execution>
-                        <id>generate-images</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>push-images</id>
-                        <phase>${docker.push.phase}</phase>
+                        <id>build-push-images</id>
                         <goals>
                             <goal>build</goal>
                             <goal>push</goal>