Fix test cases failing incorrectly

https://gerrit.onap.org/r/c/sdc/+/124980

Change-Id: I9fbd8a0b5b83d04928feea7624e593b45441ac9b
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3757

1 files changed, 693 insertions, 679 deletions

diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index e3883b75d8..170c39d426 100644
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -1,689 +1,703 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>catalog-fe</artifactId>
-  <packaging>war</packaging>
-
-  <parent>
-    <groupId>org.openecomp.sdc</groupId>
-    <artifactId>sdc-main</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
-  </parent>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-      <version>${lombok.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.functionaljava</groupId>
-      <artifactId>functionaljava</artifactId>
-      <version>${functionaljava.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.sdc.common</groupId>
-      <artifactId>onap-configuration-management-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.openecomp.sdc</groupId>
-      <artifactId>common-app-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <!-- File changes listener -->
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <version>${logback.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy</artifactId>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.codehaus.janino</groupId>
-      <artifactId>janino</artifactId>
-      <version>${janino.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-      <version>${snakeyaml.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-jci-core</artifactId>
-      <version>${commons-jci-core.version}</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-io</groupId>
-          <artifactId>commons-io</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>${gson.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.glassfish.jersey.containers</groupId>
-      <artifactId>jersey-container-servlet</artifactId>
-      <version>${jersey-bom.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.glassfish.jersey.media</groupId>
-      <artifactId>jersey-media-multipart</artifactId>
-      <version>${jersey-bom.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.glassfish.jersey.media</groupId>
-      <artifactId>jersey-media-moxy</artifactId>
-      <version>${jersey-bom.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-
-    <dependency>
-      <groupId>org.glassfish.jersey.media</groupId>
-      <artifactId>jersey-media-json-jackson</artifactId>
-      <version>${jersey-bom.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.glassfish.jersey.inject</groupId>
-      <artifactId>jersey-hk2</artifactId>
-      <version>${jersey-bom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <version>${jackson.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>${jackson.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.fasterxml.jackson.core</groupId>
-          <artifactId>jackson-core</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-      <version>${jackson-annotations.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <!-- http client -->
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>${httpclient.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
-      <version>${httpcore.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpmime</artifactId>
-      <version>${httpclient.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>${commons-logging}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>${commons-codec}</version>
-      <scope>compile</scope>
-    </dependency>
-    <!-- http client END -->
-
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>${servlet-api.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- JSON and YAML Parsing -->
-    <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-yaml</artifactId>
-      <version>${jackson.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <!-- Jetty Proxy -->
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-proxy</artifactId>
-      <version>${jetty.version}</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-http</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlets</artifactId>
-      <version>${jetty.version}</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-http</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <!-- Proxy servlet -->
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>${guava.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <!-- Aspects -->
-    <dependency>
-      <groupId>com.jcabi</groupId>
-      <artifactId>jcabi-aspects</artifactId>
-      <version>${jcabi.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>aspectjrt</artifactId>
-      <version>${aspectjrt.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>${lang3.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <version>${jaxb-api.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate.validator</groupId>
-      <artifactId>hibernate-validator</artifactId>
-      <version>${hibernate.validator.version}</version>
-    </dependency>
-
-    <!-- Inserted for ECOMP Portal Integration -->
-    <dependency>
-      <groupId>org.owasp.esapi</groupId>
-      <artifactId>esapi</artifactId>
-      <version>${org.owasp.esapi.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-io</groupId>
-          <artifactId>commons-io</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-fileupload</groupId>
-          <artifactId>commons-fileupload</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.xmlgraphics</groupId>
-          <artifactId>xmlgraphics-commons</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.portal.sdk</groupId>
-      <artifactId>epsdk-fw</artifactId>
-      <version>${ecomp.version}</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>com.att.nsa</groupId>
-          <artifactId>cambriaClient</artifactId>
-        </exclusion>
-        <exclusion>
-          <artifactId>slf4j-log4j12</artifactId>
-          <groupId>org.slf4j</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>log4j</artifactId>
-          <groupId>log4j</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <!-- System metrics -->
-    <dependency>
-      <groupId>org.fusesource</groupId>
-      <artifactId>sigar</artifactId>
-      <version>${sigar.version}</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <!-- TEST -->
-    <dependency>
-      <groupId>org.glassfish.jersey.test-framework.providers</groupId>
-      <artifactId>jersey-test-framework-provider-bundle</artifactId>
-      <version>${jersey-bom.version}</version>
-      <type>pom</type>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-server</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-continuation</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.code.bean-matchers</groupId>
-      <artifactId>bean-matchers</artifactId>
-      <version>${bean-matchers.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
-      <version>${jetty.version}</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-server</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-security</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-webapp</artifactId>
-      <version>${jetty.version}</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-servlet</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-http</artifactId>
-      <version>${jetty.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.ws.rs</groupId>
-      <artifactId>javax.ws.rs-api</artifactId>
-      <version>${ws.rs.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
-      <version>${javax.validation.version}</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-
-    <finalName>${project.artifactId}-${project.version}</finalName>
-
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-            </manifest>
-          </archive>
-
-          <webResources>
-            <resource>
-              <directory>src/main/resources</directory>
-            </resource>
-          </webResources>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-maven-plugin</artifactId>
-        <version>${jetty.version}</version>
-        <configuration>
-          <webApp>
-            <contextPath>/</contextPath>
-            <webInfIncludeJarPattern>.*/.*jersey-[^/]\.jar$</webInfIncludeJarPattern>
-          </webApp>
-          <war>${project.build.directory}/${project.build.finalName}.war</war>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>com.jcabi</groupId>
-        <artifactId>jcabi-maven-plugin</artifactId>
-        <version>${jcabi.maven.plugin.version}</version>
-        <dependencies>
-          <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjtools</artifactId>
-            <version>${aspectj.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjweaver</artifactId>
-            <version>${aspectj.version}</version>
-          </dependency>
-        </dependencies>
-        <executions>
-          <execution>
-            <goals>
-              <goal>ajc</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean.catalog.fe.folder</id>
-            <phase>clean</phase>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-            <configuration>
-              <filesets>
-                <!-- FE WAR's -->
-                <fileset>
-                  <directory>${project.parent.basedir}/catalog-fe/sdc-frontend/</directory>
-                  <followSymlinks>false</followSymlinks>
-                  <includes>
-                    <include>*.war</include>
-                  </includes>
-                </fileset>
-              </filesets>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>com.github.sylvainlaurent.maven</groupId>
-        <artifactId>yaml-json-validator-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>validate</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>validate</goal>
-            </goals>
-            <configuration>
-              <validationSets>
-                <validationSet>
-                  <includes>
-                    <include>src/main/resources/**/*.y*ml</include>
-                    <include>src/test/resources/**/*.y*ml</include>
-                  </includes>
-                </validationSet>
-                <validationSet>
-                  <includes>
-                    <include>src/main/resources/**/*.json</include>
-                    <include>src/test/resources/**/*.json</include>
-                  </includes>
-                </validationSet>
-              </validationSets>
-              <skip>${skipYamlJsonValidator}</skip>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-    </plugins>
-
-    <pluginManagement>
-      <plugins>
-        <!--This plugin's configuration is used to store Eclipse m2e settings
-          only. It has no influence on the Maven build itself. -->
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>com.jcabi</groupId>
-                    <artifactId>jcabi-maven-plugin</artifactId>
-                    <versionRange>[0.0,)</versionRange>
-                    <goals>
-                      <goal>ajc</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <execute/>
-                  </action>
-                </pluginExecution>
-
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-
-        <!-- jacbi (log injection) -->
-
-      </plugins>
-    </pluginManagement>
-
-  </build>
-
-  <profiles>
-    <profile>
-      <id>catalog</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-
-      <build>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <artifactId>catalog-fe</artifactId>
+    <build>
+
         <finalName>${project.artifactId}-${project.version}</finalName>
-      </build>
-    </profile>
-    <profile>
-      <id>docker</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <docker.username>docker</docker.username>
-        <docker.password>docker</docker.password>
-      </properties>
-      <build>
+
+        <pluginManagement>
+            <plugins>
+                <!--This plugin's configuration is used to store Eclipse m2e settings
+                  only. It has no influence on the Maven build itself. -->
+                <plugin>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+
+                                <pluginExecution>
+                                    <action>
+                                        <execute/>
+                                    </action>
+                                    <pluginExecutionFilter>
+                                        <artifactId>jcabi-maven-plugin</artifactId>
+                                        <goals>
+                                            <goal>ajc</goal>
+                                        </goals>
+                                        <groupId>com.jcabi</groupId>
+                                        <versionRange>[0.0,)</versionRange>
+                                    </pluginExecutionFilter>
+                                </pluginExecution>
+
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <version>1.0.0</version>
+                </plugin>
+
+                <!-- jacbi (log injection) -->
+
+            </plugins>
+        </pluginManagement>
+
         <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-resources-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>copy-resources-fe</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                  <outputDirectory>${basedir}/sdc-frontend</outputDirectory>
-                  <resources>
-                    <resource>
-                      <directory>${project.parent.basedir}/catalog-fe/target</directory>
-                      <includes>
-                        <include>catalog-fe-${project.version}.war</include>
-                      </includes>
-                    </resource>
-                    <resource>
-                      <directory>${project.parent.basedir}/openecomp-ui/target</directory>
-                      <includes>
-                        <include>onboarding-fe-${project.version}.war</include>
-                      </includes>
-                    </resource>
-                  </resources>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                        </manifest>
+                    </archive>
+
+                    <webResources>
+                        <resource>
+                            <directory>src/main/resources</directory>
+                        </resource>
+                    </webResources>
                 </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>io.fabric8</groupId>
-            <artifactId>docker-maven-plugin</artifactId>
-            <configuration>
-              <verbose>${verbose}</verbose>
-              <apiVersion>${docker.api.version}</apiVersion>
-              <registry>nexus3.onap.org:10001</registry>
-              <authConfig>
-                <pull>
-                  <username>${docker.username}</username>
-                  <password>${docker.password}</password>
-                </pull>
-              </authConfig>
-              <images>
-
-                <!-- Build frontend image -->
-                <image>
-                  <name>onap/sdc-frontend</name>
-                  <alias>sdc-frontend</alias>
-                  <build>
-                    <cleanup>try</cleanup>
-                    <dockerFileDir>${project.basedir}/sdc-frontend</dockerFileDir>
-                    <tags>
-                      <tag>latest</tag>
-                      <tag>
-                        ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
-                      </tag>
-                      <tag>
-                        ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}
-                      </tag>
-                    </tags>
-                  </build>
-                </image>
-              </images>
-            </configuration>
-            <executions>
-              <execution>
-                <id>clean-images</id>
-                <phase>pre-clean</phase>
-                <goals>
-                  <goal>remove</goal>
-                </goals>
+                <groupId>org.apache.maven.plugins</groupId>
+            </plugin>
+
+            <plugin>
+                <artifactId>jetty-maven-plugin</artifactId>
                 <configuration>
-                  <removeAll>true</removeAll>
-                  <image>onap/sdc-frontend</image>
+                    <war>${project.build.directory}/${project.build.finalName}.war</war>
+                    <webApp>
+                        <contextPath>/</contextPath>
+                        <webInfIncludeJarPattern>.*/.*jersey-[^/]\.jar$</webInfIncludeJarPattern>
+                    </webApp>
                 </configuration>
-              </execution>
-
-              <execution>
-                <id>generate-images</id>
-                <phase>install</phase>
-                <goals>
-                  <goal>build</goal>
-                </goals>
-              </execution>
-
-              <execution>
-                <id>push-images</id>
-                <phase>deploy</phase>
-                <goals>
-                  <goal>push</goal>
-                </goals>
+                <groupId>org.eclipse.jetty</groupId>
+                <version>${jetty.version}</version>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-deploy-plugin</artifactId>
                 <configuration>
-                  <image>onap/sdc-frontend</image>
+                    <skip>true</skip>
                 </configuration>
-              </execution>
-            </executions>
-          </plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+            </plugin>
+
+            <plugin>
+                <artifactId>jcabi-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <artifactId>aspectjtools</artifactId>
+                        <groupId>org.aspectj</groupId>
+                        <version>${aspectj.version}</version>
+                    </dependency>
+                    <dependency>
+                        <artifactId>aspectjweaver</artifactId>
+                        <groupId>org.aspectj</groupId>
+                        <version>${aspectj.version}</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>ajc</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <groupId>com.jcabi</groupId>
+                <version>${jcabi.maven.plugin.version}</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <configuration>
+                            <filesets>
+                                <!-- FE WAR's -->
+                                <fileset>
+                                    <directory>${project.parent.basedir}/catalog-fe/sdc-frontend/
+                                    </directory>
+                                    <followSymlinks>false</followSymlinks>
+                                    <includes>
+                                        <include>*.war</include>
+                                    </includes>
+                                </fileset>
+                            </filesets>
+                        </configuration>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                        <id>clean.catalog.fe.folder</id>
+                        <phase>clean</phase>
+                    </execution>
+                </executions>
+                <groupId>org.apache.maven.plugins</groupId>
+            </plugin>
+            <plugin>
+                <artifactId>yaml-json-validator-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <configuration>
+                            <skip>${skipYamlJsonValidator}</skip>
+                            <validationSets>
+                                <validationSet>
+                                    <includes>
+                                        <include>src/main/resources/**/*.y*ml</include>
+                                        <include>src/test/resources/**/*.y*ml</include>
+                                    </includes>
+                                </validationSet>
+                                <validationSet>
+                                    <includes>
+                                        <include>src/main/resources/**/*.json</include>
+                                        <include>src/test/resources/**/*.json</include>
+                                    </includes>
+                                </validationSet>
+                            </validationSets>
+                        </configuration>
+                        <goals>
+                            <goal>validate</goal>
+                        </goals>
+                        <id>validate</id>
+                        <phase>validate</phase>
+                    </execution>
+                </executions>
+                <groupId>com.github.sylvainlaurent.maven</groupId>
+            </plugin>
+
         </plugins>
-      </build>
-    </profile>
-  </profiles>
+
+    </build>
+    <dependencies>
+
+        <dependency>
+            <artifactId>lombok</artifactId>
+            <groupId>org.projectlombok</groupId>
+            <version>${lombok.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>functionaljava</artifactId>
+            <groupId>org.functionaljava</groupId>
+            <scope>compile</scope>
+            <version>${functionaljava.version}</version>
+        </dependency>
+        <dependency>
+            <artifactId>onap-configuration-management-api</artifactId>
+            <groupId>org.onap.sdc.common</groupId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <artifactId>common-app-api</artifactId>
+            <groupId>org.openecomp.sdc</groupId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!-- File changes listener -->
+        <dependency>
+            <artifactId>logback-classic</artifactId>
+            <groupId>ch.qos.logback</groupId>
+            <scope>compile</scope>
+            <version>${logback.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>groovy</artifactId>
+            <groupId>org.codehaus.groovy</groupId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <artifactId>janino</artifactId>
+            <groupId>org.codehaus.janino</groupId>
+            <scope>compile</scope>
+            <version>${janino.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>snakeyaml</artifactId>
+            <groupId>org.yaml</groupId>
+            <scope>compile</scope>
+            <version>${snakeyaml.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>commons-jci-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-io</artifactId>
+                    <groupId>commons-io</groupId>
+                </exclusion>
+            </exclusions>
+            <groupId>org.apache.commons</groupId>
+            <scope>compile</scope>
+            <version>${commons-jci-core.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>gson</artifactId>
+            <groupId>com.google.code.gson</groupId>
+            <scope>compile</scope>
+            <version>${gson.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>jersey-container-servlet</artifactId>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <scope>compile</scope>
+            <version>${jersey-bom.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>jersey-media-multipart</artifactId>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <scope>compile</scope>
+            <version>${jersey-bom.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>jersey-media-moxy</artifactId>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <scope>compile</scope>
+            <version>${jersey-bom.version}</version>
+        </dependency>
+
+
+        <dependency>
+            <artifactId>jersey-media-json-jackson</artifactId>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <scope>compile</scope>
+            <version>${jersey-bom.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>jersey-hk2</artifactId>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <version>${jersey-bom.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>jackson-core</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <scope>compile</scope>
+            <version>${jackson.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>jackson-databind</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jackson-core</artifactId>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                </exclusion>
+            </exclusions>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <version>${jackson.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>jackson-annotations</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <scope>compile</scope>
+            <version>${jackson-annotations.version}</version>
+        </dependency>
+
+        <!-- http client -->
+        <dependency>
+            <artifactId>httpclient</artifactId>
+            <groupId>org.apache.httpcomponents</groupId>
+            <scope>compile</scope>
+            <version>${httpclient.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>httpcore</artifactId>
+            <groupId>org.apache.httpcomponents</groupId>
+            <scope>compile</scope>
+            <version>${httpcore.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>httpmime</artifactId>
+            <groupId>org.apache.httpcomponents</groupId>
+            <scope>compile</scope>
+            <version>${httpclient.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>commons-logging</artifactId>
+            <groupId>commons-logging</groupId>
+            <scope>compile</scope>
+            <version>${commons-logging}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>commons-codec</artifactId>
+            <groupId>commons-codec</groupId>
+            <scope>compile</scope>
+            <version>${commons-codec}</version>
+        </dependency>
+        <!-- http client END -->
+
+        <dependency>
+            <artifactId>javax.servlet-api</artifactId>
+            <groupId>javax.servlet</groupId>
+            <scope>provided</scope>
+            <version>${servlet-api.version}</version>
+        </dependency>
+
+        <!-- JSON and YAML Parsing -->
+        <dependency>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <scope>compile</scope>
+            <version>${jackson.version}</version>
+        </dependency>
+
+        <!-- Jetty Proxy -->
+        <dependency>
+            <artifactId>jetty-proxy</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jetty-http</artifactId>
+                    <groupId>org.eclipse.jetty</groupId>
+                </exclusion>
+            </exclusions>
+            <groupId>org.eclipse.jetty</groupId>
+            <scope>compile</scope>
+            <version>${jetty.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>jetty-servlets</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jetty-http</artifactId>
+                    <groupId>org.eclipse.jetty</groupId>
+                </exclusion>
+            </exclusions>
+            <groupId>org.eclipse.jetty</groupId>
+            <scope>compile</scope>
+            <version>${jetty.version}</version>
+        </dependency>
+
+        <!-- Proxy servlet -->
+        <dependency>
+            <artifactId>guava</artifactId>
+            <groupId>com.google.guava</groupId>
+            <scope>compile</scope>
+            <version>${guava.version}</version>
+        </dependency>
+
+        <!-- Aspects -->
+        <dependency>
+            <artifactId>jcabi-aspects</artifactId>
+            <groupId>com.jcabi</groupId>
+            <scope>compile</scope>
+            <version>${jcabi.version}</version>
+        </dependency>
+        <dependency>
+            <artifactId>aspectjrt</artifactId>
+            <groupId>org.aspectj</groupId>
+            <scope>compile</scope>
+            <version>${aspectjrt.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>commons-lang3</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <scope>compile</scope>
+            <version>${lang3.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>jaxb-api</artifactId>
+            <groupId>javax.xml.bind</groupId>
+            <scope>compile</scope>
+            <version>${jaxb-api.version}</version>
+        </dependency>
+        <dependency>
+            <artifactId>hibernate-validator</artifactId>
+            <groupId>org.hibernate.validator</groupId>
+            <version>${hibernate.validator.version}</version>
+        </dependency>
+
+        <!-- Inserted for ECOMP Portal Integration -->
+        <dependency>
+            <artifactId>esapi</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>log4j</artifactId>
+                    <groupId>log4j</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-io</artifactId>
+                    <groupId>commons-io</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-fileupload</artifactId>
+                    <groupId>commons-fileupload</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>xmlgraphics-commons</artifactId>
+                    <groupId>org.apache.xmlgraphics</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>xml-apis-ext</artifactId>
+                    <groupId>xml-apis</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>xml-apis</artifactId>
+                    <groupId>xml-apis</groupId>
+                </exclusion>
+            </exclusions>
+            <groupId>org.owasp.esapi</groupId>
+            <version>${org.owasp.esapi.version}</version>
+        </dependency>
+        <dependency>
+            <artifactId>epsdk-fw</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>cambriaClient</artifactId>
+                    <groupId>com.att.nsa</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>slf4j-log4j12</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>log4j</artifactId>
+                    <groupId>log4j</groupId>
+                </exclusion>
+            </exclusions>
+            <groupId>org.onap.portal.sdk</groupId>
+            <scope>compile</scope>
+            <version>${ecomp.version}</version>
+        </dependency>
+        <!-- System metrics -->
+        <dependency>
+            <artifactId>sigar</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>log4j</artifactId>
+                    <groupId>log4j</groupId>
+                </exclusion>
+            </exclusions>
+            <groupId>org.fusesource</groupId>
+            <scope>compile</scope>
+            <version>${sigar.version}</version>
+        </dependency>
+
+        <!-- TEST -->
+        <dependency>
+            <artifactId>jersey-test-framework-provider-bundle</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jetty-server</artifactId>
+                    <groupId>org.eclipse.jetty</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jetty-continuation</artifactId>
+                    <groupId>org.eclipse.jetty</groupId>
+                </exclusion>
+            </exclusions>
+            <groupId>org.glassfish.jersey.test-framework.providers</groupId>
+            <scope>test</scope>
+            <type>pom</type>
+            <version>${jersey-bom.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>bean-matchers</artifactId>
+            <groupId>com.google.code.bean-matchers</groupId>
+            <scope>test</scope>
+            <version>${bean-matchers.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>jetty-servlet</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jetty-server</artifactId>
+                    <groupId>org.eclipse.jetty</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jetty-security</artifactId>
+                    <groupId>org.eclipse.jetty</groupId>
+                </exclusion>
+            </exclusions>
+            <groupId>org.eclipse.jetty</groupId>
+            <scope>test</scope>
+            <version>${jetty.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>jetty-webapp</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jetty-servlet</artifactId>
+                    <groupId>org.eclipse.jetty</groupId>
+                </exclusion>
+            </exclusions>
+            <groupId>org.eclipse.jetty</groupId>
+            <scope>test</scope>
+            <version>${jetty.version}</version>
+        </dependency>
+        <dependency>
+            <artifactId>jetty-http</artifactId>
+            <groupId>org.eclipse.jetty</groupId>
+            <version>${jetty.version}</version>
+        </dependency>
+        <dependency>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>javax.ws.rs</groupId>
+            <scope>compile</scope>
+            <version>${ws.rs.version}</version>
+        </dependency>
+
+        <dependency>
+            <artifactId>validation-api</artifactId>
+            <groupId>javax.validation</groupId>
+            <version>${javax.validation.version}</version>
+        </dependency>
+    </dependencies>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <packaging>war</packaging>
+
+    <parent>
+        <artifactId>sdc-main</artifactId>
+        <groupId>org.openecomp.sdc</groupId>
+        <version>1.10.0-SNAPSHOT</version>
+    </parent>
+
+    <profiles>
+        <profile>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <finalName>${project.artifactId}-${project.version}</finalName>
+            </build>
+
+            <id>catalog</id>
+        </profile>
+        <profile>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <configuration>
+                                    <outputDirectory>${basedir}/sdc-frontend</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>${project.parent.basedir}/catalog-fe/target
+                                            </directory>
+                                            <includes>
+                                                <include>catalog-fe-${project.version}.war</include>
+                                            </includes>
+                                        </resource>
+                                        <resource>
+                                            <directory>
+                                                ${project.parent.basedir}/openecomp-ui/target
+                                            </directory>
+                                            <includes>
+                                                <include>onboarding-fe-${project.version}.war
+                                                </include>
+                                            </includes>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <id>copy-resources-fe</id>
+                                <phase>verify</phase>
+                            </execution>
+                        </executions>
+                        <groupId>org.apache.maven.plugins</groupId>
+                    </plugin>
+                    <plugin>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
+                            <apiVersion>${docker.api.version}</apiVersion>
+                            <authConfig>
+                                <pull>
+                                    <password>${docker.password}</password>
+                                    <username>${docker.username}</username>
+                                </pull>
+                            </authConfig>
+                            <images>
+
+                                <!-- Build frontend image -->
+                                <image>
+                                    <alias>sdc-frontend</alias>
+                                    <build>
+                                        <cleanup>try</cleanup>
+                                        <dockerFileDir>${project.basedir}/sdc-frontend
+                                        </dockerFileDir>
+                                        <tags>
+                                            <tag>latest</tag>
+                                            <tag>
+                                                ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+                                            </tag>
+                                            <tag>
+                                                ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}
+                                            </tag>
+                                        </tags>
+                                    </build>
+                                    <name>onap/sdc-frontend</name>
+                                </image>
+                            </images>
+                            <registry>nexus3.onap.org:10001</registry>
+                            <verbose>${verbose}</verbose>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <configuration>
+                                    <image>onap/sdc-frontend</image>
+                                    <removeAll>true</removeAll>
+                                </configuration>
+                                <goals>
+                                    <goal>remove</goal>
+                                </goals>
+                                <id>clean-images</id>
+                                <phase>pre-clean</phase>
+                            </execution>
+
+                            <execution>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                                <id>generate-images</id>
+                                <phase>install</phase>
+                            </execution>
+
+                            <execution>
+                                <configuration>
+                                    <image>onap/sdc-frontend</image>
+                                </configuration>
+                                <goals>
+                                    <goal>push</goal>
+                                </goals>
+                                <id>push-images</id>
+                                <phase>deploy</phase>
+                            </execution>
+                        </executions>
+                        <groupId>io.fabric8</groupId>
+                    </plugin>
+                </plugins>
+            </build>
+            <id>docker</id>
+            <properties>
+                <docker.password>docker</docker.password>
+                <docker.username>docker</docker.username>
+            </properties>
+        </profile>
+    </profiles>
 </project>