X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fsdnc-web%2Fpom.xml;h=aa06272a07b7b8c53d70cdf747de90827365837e;hb=6148bb7d53b1dea484bbd2715e91548a9137bf2a;hp=8817c936f2b0eb602c0fb48b5dd9d65d41627592;hpb=53a21834ccd5925b806c245650ee3aa9a94f9fbf;p=sdnc%2Foam.git

diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml
index 8817c936..aa06272a 100644
--- a/installation/sdnc-web/pom.xml
+++ b/installation/sdnc-web/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>installation</artifactId>
-        <version>2.3.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>installation-sdnc-web</artifactId>
@@ -15,7 +15,7 @@
     <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>
@@ -36,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>
@@ -59,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>
@@ -78,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>
@@ -107,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>