X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog-be%2Fpom.xml;h=6046156a8eb91680b0abfb9c053dfa331d69392c;hb=9dcb6f393bfc76237cca809b39d5034afecf1c55;hp=97cd8b6df0c855fa430bb2d9d77060bbc1b01218;hpb=f0d4dd5c846f1c56d8b2641934c028b8151b31b3;p=sdc.git

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 97cd8b6df0..6046156a8e 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -1,748 +1,527 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="http://maven.apache.org/POM/4.0.0"
+<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">
-    <artifactId>catalog-be</artifactId>
+    <modelVersion>4.0.0</modelVersion>
 
-    <build>
-        <finalName>catalog-be</finalName>
-        <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>
-                                    <pluginExecutionFilter>
-                                        <artifactId>download-maven-plugin</artifactId>
-                                        <goals>
-                                            <goal>wget</goal>
-                                        </goals>
-                                        <groupId>com.googlecode.maven-download-plugin</groupId>
-                                        <versionRange>[1.2.1,)</versionRange>
-                                    </pluginExecutionFilter>
-                                </pluginExecution>
+    <artifactId>catalog-be</artifactId>
+    <packaging>war</packaging>
 
-                                <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>
+    <parent>
+        <groupId>org.openecomp.sdc</groupId>
+        <artifactId>sdc-main</artifactId>
+        <version>1.13.4-SNAPSHOT</version>
+    </parent>
 
-                            </pluginExecutions>
-                        </lifecycleMappingMetadata>
-                    </configuration>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <version>1.0.0</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
+    <properties>
+        <java-hamcrest.version>2.0.0.0</java-hamcrest.version>
+        <swagger.version>${swagger-core-mvn-plugin.version}</swagger.version>
+        <swagger-ui.version>3.25.0</swagger-ui.version>
+        <maven-dependency-plugin.version>3.2.0</maven-dependency-plugin.version>
+        <replacer.plugin.version>1.5.3</replacer.plugin.version>
+        <ui.version>${project.version}</ui.version>
+    </properties>
 
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkCount>1C</forkCount>
-                    <reuseForks>false</reuseForks>
-                </configuration>
-                <groupId>org.apache.maven.plugins</groupId>
-            </plugin>
-            <plugin>
-                <!-- Download Swagger UI webjar. -->
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <artifactId>swagger-ui</artifactId>
-                                    <groupId>org.webjars</groupId>
-                                    <version>${swagger-ui.version}</version>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/swagger-ui</outputDirectory>
-                        </configuration>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <phase>prepare-package</phase>
-                    </execution>
-                </executions>
-                <version>${maven-dependency-plugin.version}</version>
-            </plugin>
-            <plugin>
-                <!-- Replace the OpenAPI specification example URL with the local one. -->
-                <artifactId>replacer</artifactId>
-                <configuration>
-                    <file>
-                        ${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}/index.html
-                    </file>
-                    <replacements>
-                        <replacement>
-                            <token>https://petstore.swagger.io/v2/swagger.json</token>
-                            <value>/sdc/openapi.json</value>
-                        </replacement>
-                    </replacements>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>replace</goal>
-                        </goals>
-                        <phase>prepare-package</phase>
-                    </execution>
-                </executions>
-                <groupId>com.google.code.maven-replacer-plugin</groupId>
-                <version>${replacer.plugin.version}</version>
-            </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                        <manifestEntries>
-                            <SDC-Version>${project.version}</SDC-Version>
-                        </manifestEntries>
-                    </archive>
-                    <attachClasses>true</attachClasses>
-                    <packagingExcludes>WEB-INF\lib\slf4j-log4j*.jar,
-                        WEB-INF/classes/elasticsearch.yml,
-                        WEB-INF/classes/portal.properties
-                    </packagingExcludes>
-                    <webResources combine.children="append">
-                        <resource>
-                            <directory>
-                                ${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}
-                            </directory>
-                            <includes>
-                                <include>**/*.*</include>
-                            </includes>
-                            <targetPath>swagger-ui</targetPath>
-                        </resource>
-                    </webResources>
-                </configuration>
-                <groupId>org.apache.maven.plugins</groupId>
-            </plugin>
-            <plugin>
-                <artifactId>yaml-json-validator-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <skip>${skipYamlJsonValidator}</skip>
-                            <validationSets>
-                                <validationSet>
-                                    <excludes>
-                                        <exclude>
-                                            src/test/resources/artifacts/pnfSoftwareInformation/**
-                                        </exclude>
-                                    </excludes>
-                                    <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>
-            <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-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <descriptors>
-                                <descriptor>src/main/assembly/normatives.xml</descriptor>
-                            </descriptors>
-                            <finalName>normatives</finalName>
-                        </configuration>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <id>normatives</id>
-                        <phase>prepare-package</phase>
-                    </execution>
-                </executions>
-                <groupId>org.apache.maven.plugins</groupId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <filesets>
-                                <fileset>
-                                    <directory>
-                                        sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default
-                                    </directory>
-                                    <followSymlinks>false</followSymlinks>
-                                    <includes>
-                                        <include>normatives.tar.gz</include>
-                                    </includes>
-                                </fileset>
-                            </filesets>
-                        </configuration>
-                        <goals>
-                            <goal>clean</goal>
-                        </goals>
-                        <id>clean.sdc.backend.folder</id>
-                        <phase>clean</phase>
-                    </execution>
-                </executions>
-                <groupId>org.apache.maven.plugins</groupId>
-            </plugin>
-            <plugin>
-                <artifactId>swagger-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <configurationFilePath>
-                                ${project.basedir}/src/main/resources/swagger-config/sdce-2-sdce-5.yaml
-                            </configurationFilePath>
-                            <contextId>sdce-2-sdce-5</contextId>
-                            <outputFileName>swagger-sdce-2-sdce-5</outputFileName>
-                            <outputFormat>JSON</outputFormat>
-                            <outputPath>${project.build.directory}/generated/swagger</outputPath>
-                            <skip>${swagger.skip}</skip>
-                        </configuration>
-                        <goals>
-                            <goal>resolve</goal>
-                        </goals>
-                        <id>sdce-2-sdce-5</id>
-                        <phase>compile</phase>
-                    </execution>
-                    <execution>
-                        <configuration>
-                            <configurationFilePath>
-                                ${project.basedir}/src/main/resources/swagger-config/sdce-4.yaml
-                            </configurationFilePath>
-                            <contextId>sdce-4</contextId>
-                            <outputFileName>swagger-sdce-4</outputFileName>
-                            <outputFormat>JSON</outputFormat>
-                            <outputPath>${project.build.directory}/generated/swagger</outputPath>
-                            <skip>${swagger.skip}</skip>
-                        </configuration>
-                        <goals>
-                            <goal>resolve</goal>
-                        </goals>
-                        <id>sdce-4</id>
-                        <phase>compile</phase>
-                    </execution>
-                    <execution>
-                        <configuration>
-                            <configurationFilePath>
-                                ${project.basedir}/src/main/resources/swagger-config/sdce-6.yaml
-                            </configurationFilePath>
-                            <contextId>sdce-6</contextId>
-                            <outputFileName>swagger-sdce-6</outputFileName>
-                            <outputFormat>JSON</outputFormat>
-                            <outputPath>${project.build.directory}/generated/swagger</outputPath>
-                            <skip>${swagger.skip}</skip>
-                        </configuration>
-                        <goals>
-                            <goal>resolve</goal>
-                        </goals>
-                        <id>sdce-6</id>
-                        <phase>compile</phase>
-                    </execution>
-                    <execution>
-                        <configuration>
-                            <configurationFilePath>
-                                ${project.basedir}/src/main/resources/swagger-config/sdce-7.yaml
-                            </configurationFilePath>
-                            <contextId>sdce-7</contextId>
-                            <outputFileName>swagger-sdce-7</outputFileName>
-                            <outputFormat>JSON</outputFormat>
-                            <outputPath>${project.build.directory}/generated/swagger</outputPath>
-                            <skip>${swagger.skip}</skip>
-                        </configuration>
-                        <goals>
-                            <goal>resolve</goal>
-                        </goals>
-                        <id>sdce-7</id>
-                        <phase>compile</phase>
-                    </execution>
-                </executions>
-                <groupId>io.swagger.core.v3</groupId>
-                <version>${swagger-core-mvn-plugin.version}</version>
-            </plugin>
-        </plugins>
-        <!-- Swagger Plugins End -->
-    </build>
     <dependencies>
+
         <dependency>
+            <groupId>org.openecomp.sdc</groupId>
             <artifactId>togglz-rest-services</artifactId>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
-                    <artifactId>woodstox-core</artifactId>
                     <groupId>com.fasterxml.woodstox</groupId>
+                    <artifactId>woodstox-core</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.openecomp.sdc</groupId>
-            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>${jsoup.version}</version>
         </dependency>
 
         <!--JSON and YAML Parsing-->
         <dependency>
-            <artifactId>jackson-core</artifactId>
+            <groupId>com.networknt</groupId>
+            <artifactId>json-schema-validator</artifactId>
+            <version>1.0.84</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
             <version>${jackson.version}</version>
         </dependency>
         <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
+            <version>${jackson.version}</version>
             <exclusions>
                 <exclusion>
-                    <artifactId>jackson-core</artifactId>
                     <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <version>${jackson.version}</version>
         </dependency>
-
         <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
             <exclusions>
                 <exclusion>
-                    <artifactId>jackson-core</artifactId>
                     <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <version>${jackson.version}</version>
         </dependency>
 
         <dependency>
-            <artifactId>onap-generic-artifact-browser-service</artifactId>
             <groupId>org.onap.sdc.common</groupId>
-            <scope>compile</scope>
+            <artifactId>onap-generic-artifact-browser-service</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
 
         <!-- Swagger Dependencies Start -->
         <dependency>
+            <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-jaxrs2</artifactId>
+            <version>${swagger.version}</version>
             <exclusions>
                 <exclusion>
-                    <artifactId>jackson-core</artifactId>
                     <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.jaxrs</groupId>
+                    <artifactId>jackson-jaxrs-json-provider</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.github.classgraph</groupId>
+                    <artifactId>classgraph</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>io.swagger.core.v3</groupId>
-            <version>${swagger.version}</version>
         </dependency>
         <dependency>
-            <artifactId>swagger-annotations</artifactId>
             <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-annotations</artifactId>
             <version>${swagger.version}</version>
         </dependency>
         <!-- Swagger Dependencies End -->
 
         <dependency>
-            <artifactId>hibernate-validator</artifactId>
             <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
             <version>${hibernate.validator.version}</version>
         </dependency>
 
         <dependency>
-            <artifactId>common-app-api</artifactId>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>${jetty.version}</version>
+            <scope>compile</scope>
             <exclusions>
                 <exclusion>
-                    <artifactId>jackson-core</artifactId>
-                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-http</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
                 </exclusion>
             </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+            <version>${jetty.version}</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-security</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
             <groupId>org.openecomp.sdc</groupId>
+            <artifactId>common-app-api</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpcore</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.functionaljava</groupId>
+                    <artifactId>functionaljava</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
-            <artifactId>javax.ws.rs-api</artifactId>
-            <groupId>javax.ws.rs</groupId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
             <version>${ws.rs.version}</version>
         </dependency>
 
         <dependency>
+            <groupId>org.openecomp.sdc.be</groupId>
             <artifactId>common-be</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
             <exclusions>
                 <exclusion>
-                    <artifactId>spring-core</artifactId>
                     <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.openecomp.sdc.be</groupId>
-            <scope>compile</scope>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
-            <artifactId>common-be</artifactId>
+            <groupId>org.openecomp.sdc.be</groupId>
+            <artifactId>common-be-tests-utils</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
             <exclusions>
                 <exclusion>
-                    <artifactId>spring-core</artifactId>
                     <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-server</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-servlet</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.openecomp.sdc.be</groupId>
-            <scope>test</scope>
-            <type>test-jar</type>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.openecomp.sdc.be</groupId>
             <artifactId>catalog-dao</artifactId>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
-                    <artifactId>jackson-core</artifactId>
                     <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.openecomp.sdc.be</groupId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
+            <groupId>org.openecomp.sdc.be</groupId>
             <artifactId>catalog-model</artifactId>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
-                    <artifactId>jackson-core</artifactId>
                     <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.openecomp.sdc.be</groupId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <artifactId>logback-classic</artifactId>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+            <version>${micrometer.version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>ch.qos.logback</groupId>
-            <scope>compile</scope>
+            <artifactId>logback-classic</artifactId>
             <version>${logback.version}</version>
+            <scope>compile</scope>
         </dependency>
 
         <!-- Snake Yaml -->
         <dependency>
-            <artifactId>snakeyaml</artifactId>
             <groupId>org.yaml</groupId>
-            <scope>compile</scope>
+            <artifactId>snakeyaml</artifactId>
             <version>${snakeyaml.version}</version>
-        </dependency>
-
-        <!-- File changes listener -->
-        <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>
 
         <!-- Gson -->
         <dependency>
-            <artifactId>gson</artifactId>
             <groupId>com.google.code.gson</groupId>
-            <scope>compile</scope>
+            <artifactId>gson</artifactId>
             <version>${gson.version}</version>
+            <scope>compile</scope>
         </dependency>
 
         <!-- jersey -->
         <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-json-jackson</artifactId>
+            <version>${jersey-bom.version}</version>
             <exclusions>
                 <exclusion>
-                    <artifactId>jackson-core</artifactId>
                     <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.module</groupId>
+                    <artifactId>jackson-module-jaxb-annotations</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.glassfish.jersey.media</groupId>
-            <version>${jersey-bom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jaxb-annotations</artifactId>
+            <version>${jackson.version}</version>
         </dependency>
 
         <dependency>
-            <artifactId>jersey-container-servlet-core</artifactId>
             <groupId>org.glassfish.jersey.containers</groupId>
-            <scope>compile</scope>
+            <artifactId>jersey-container-servlet-core</artifactId>
             <version>${jersey-bom.version}</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <artifactId>jersey-media-multipart</artifactId>
             <groupId>org.glassfish.jersey.media</groupId>
-            <scope>compile</scope>
+            <artifactId>jersey-media-multipart</artifactId>
             <version>${jersey-bom.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
+            <groupId>org.glassfish.jersey.ext</groupId>
             <artifactId>jersey-spring4</artifactId>
+            <version>${jersey-bom.version}</version>
             <exclusions>
                 <exclusion>
-                    <artifactId>spring-web</artifactId>
                     <groupId>org.springframework</groupId>
+                    <artifactId>spring-web</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>spring-beans</artifactId>
                     <groupId>org.springframework</groupId>
+                    <artifactId>spring-beans</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>spring-core</artifactId>
                     <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>spring-aop</artifactId>
                     <groupId>org.springframework</groupId>
+                    <artifactId>spring-aop</artifactId>
                 </exclusion>
                 <!-- Transitive dependency of spring-bridge -->
                 <exclusion>
-                    <artifactId>spring-context</artifactId>
                     <groupId>org.springframework</groupId>
+                    <artifactId>spring-context</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>hibernate-validator</artifactId>
                     <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-validator</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.glassfish.jersey.ext</groupId>
-            <version>${jersey-bom.version}</version>
 
         </dependency>
 
         <!--asm-all-repackaged is a jersey dependency. in current version jersey depends on a version that was compiled using java 9 compiler
             currently our jetty (v9.3.6) does not support java 9. as soon as jetty gets upgraded we will remove this dependency-->
         <dependency>
-            <artifactId>asm-all-repackaged</artifactId>
             <groupId>org.glassfish.hk2.external</groupId>
+            <artifactId>asm-all-repackaged</artifactId>
         </dependency>
 
         <dependency>
+            <groupId>org.glassfish.jersey.ext</groupId>
             <artifactId>jersey-bean-validation</artifactId>
             <exclusions>
                 <exclusion>
-                    <artifactId>hibernate-validator</artifactId>
                     <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-validator</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.glassfish</groupId>
+                    <artifactId>jakarta.el</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.glassfish.jersey.ext</groupId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.el</artifactId>
+            <version>${jakarta.el.version}</version>
         </dependency>
 
         <!-- http client -->
         <dependency>
-            <artifactId>httpclient</artifactId>
-            <groupId>org.apache.httpcomponents</groupId>
-            <scope>compile</scope>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
             <version>${httpclient.version}</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpcore</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
-            <artifactId>httpcore</artifactId>
             <groupId>org.apache.httpcomponents</groupId>
-            <scope>compile</scope>
+            <artifactId>httpcore</artifactId>
             <version>${httpcore.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>
+            <artifactId>commons-codec</artifactId>
             <version>${commons-codec}</version>
+            <scope>compile</scope>
         </dependency>
         <!-- http client END -->
 
         <dependency>
-            <artifactId>javax.servlet-api</artifactId>
-            <groupId>javax.servlet</groupId>
-            <scope>provided</scope>
-            <version>${servlet-api.version}</version>
-        </dependency>
-
-        <dependency>
-            <artifactId>org.eclipse.jgit</artifactId>
             <groupId>org.eclipse.jgit</groupId>
+            <artifactId>org.eclipse.jgit</artifactId>
             <version>3.4.1.201406201815-r</version>
         </dependency>
 
         <!-- spring - used by A4C -->
         <dependency>
-            <artifactId>spring-core</artifactId>
             <groupId>org.springframework</groupId>
-            <scope>compile</scope>
+            <artifactId>spring-core</artifactId>
             <version>${spring.version}</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
+            <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+            <scope>compile</scope>
             <exclusions>
                 <exclusion>
-                    <artifactId>spring-expression</artifactId>
                     <groupId>org.springframework</groupId>
+                    <artifactId>spring-expression</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>spring-core</artifactId>
                     <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.springframework</groupId>
-            <scope>compile</scope>
-            <version>${spring.version}</version>
         </dependency>
 
         <dependency>
+            <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
+            <version>${spring.version}</version>
+            <scope>compile</scope>
             <exclusions>
                 <exclusion>
-                    <artifactId>spring-core</artifactId>
                     <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.springframework</groupId>
-            <scope>compile</scope>
-            <version>${spring.version}</version>
         </dependency>
 
         <dependency>
+            <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
+            <version>${spring.version}</version>
+            <scope>compile</scope>
             <exclusions>
                 <exclusion>
-                    <artifactId>spring-expression</artifactId>
                     <groupId>org.springframework</groupId>
+                    <artifactId>spring-expression</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>spring-core</artifactId>
                     <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>spring-web</artifactId>
                     <groupId>org.springframework</groupId>
+                    <artifactId>spring-web</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.springframework</groupId>
-            <scope>compile</scope>
-            <version>${spring.version}</version>
         </dependency>
 
         <dependency>
+            <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
+            <version>${spring.version}</version>
+            <scope>compile</scope>
             <exclusions>
                 <exclusion>
-                    <artifactId>spring-core</artifactId>
                     <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.springframework</groupId>
-            <scope>compile</scope>
-            <version>${spring.version}</version>
         </dependency>
 
         <dependency>
-            <artifactId>spring-beans</artifactId>
             <groupId>org.springframework</groupId>
-            <scope>compile</scope>
+            <artifactId>spring-beans</artifactId>
             <version>${spring.version}</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <artifactId>spring-expression</artifactId>
             <groupId>org.springframework</groupId>
-            <scope>compile</scope>
+            <artifactId>spring-expression</artifactId>
             <version>${spring.version}</version>
+            <scope>compile</scope>
         </dependency>
 
         <!-- Spring integration (optional) -->
         <dependency>
-            <artifactId>togglz-spring-web</artifactId>
             <groupId>org.togglz</groupId>
+            <artifactId>togglz-spring-web</artifactId>
             <version>${togglz.version}</version>
         </dependency>
 
         <dependency>
-            <artifactId>janino</artifactId>
             <groupId>org.codehaus.janino</groupId>
-            <scope>compile</scope>
+            <artifactId>janino</artifactId>
             <version>${janino.version}</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <artifactId>commons-compiler</artifactId>
             <groupId>org.codehaus.janino</groupId>
-            <scope>compile</scope>
+            <artifactId>commons-compiler</artifactId>
             <version>${janino.version}</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <artifactId>guava</artifactId>
             <groupId>com.google.guava</groupId>
-            <scope>compile</scope>
+            <artifactId>guava</artifactId>
             <version>${guava.version}</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
+            <groupId>org.janusgraph</groupId>
             <artifactId>janusgraph-core</artifactId>
+            <version>${janusgraph.version}</version>
+            <scope>compile</scope>
             <exclusions>
                 <exclusion>
+                    <groupId>org.apache.tinkerpop</groupId>
                     <artifactId>gremlin-groovy</artifactId>
+                </exclusion>
+                <exclusion>
                     <groupId>org.apache.tinkerpop</groupId>
+                    <artifactId>gremlin-core</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>json</artifactId>
                     <groupId>org.json</groupId>
+                    <artifactId>json</artifactId>
                 </exclusion>
                 <exclusion>
                     <artifactId>slf4j-log4j12</artifactId>
@@ -753,37 +532,41 @@
                     <groupId>commons-collections</groupId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>libthrift</artifactId>
                     <groupId>org.apache.thrift</groupId>
+                    <artifactId>libthrift</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>commons-io</artifactId>
                     <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>commons-codec</artifactId>
                     <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>dom4j</artifactId>
                     <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.janusgraph</groupId>
-            <scope>compile</scope>
-            <version>${janusgraph.version}</version>
         </dependency>
 
         <dependency>
+            <groupId>org.janusgraph</groupId>
             <artifactId>janusgraph-cql</artifactId>
+            <version>${janusgraph.version}</version>
+            <scope>compile</scope>
             <exclusions>
                 <exclusion>
-                    <artifactId>slf4j-log4j12</artifactId>
                     <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>json</artifactId>
                     <groupId>org.json</groupId>
+                    <artifactId>json</artifactId>
                 </exclusion>
                 <exclusion>
                     <artifactId>commons-collections</artifactId>
@@ -794,136 +577,141 @@
                     <groupId>org.codehaus.groovy</groupId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>netty-all</artifactId>
                     <groupId>io.netty</groupId>
+                    <artifactId>netty-all</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.janusgraph</groupId>
-            <scope>compile</scope>
-            <version>${janusgraph.version}</version>
         </dependency>
 
         <dependency>
-            <artifactId>commons-lang3</artifactId>
             <groupId>org.apache.commons</groupId>
-            <scope>compile</scope>
+            <artifactId>commons-lang3</artifactId>
             <version>${lang3.version}</version>
-        </dependency>
-
-        <dependency>
-            <artifactId>json-simple</artifactId>
-            <groupId>com.googlecode.json-simple</groupId>
             <scope>compile</scope>
-            <version>${json-simple.version}</version>
-
         </dependency>
 
         <!-- functional java -->
         <dependency>
-            <artifactId>functionaljava</artifactId>
             <groupId>org.functionaljava</groupId>
-            <scope>compile</scope>
+            <artifactId>functionaljava</artifactId>
             <version>${functionaljava.version}</version>
+            <scope>compile</scope>
         </dependency>
 
         <!-- Aspects -->
         <dependency>
-            <artifactId>jcabi-aspects</artifactId>
             <groupId>com.jcabi</groupId>
-            <scope>compile</scope>
+            <artifactId>jcabi-aspects</artifactId>
             <version>${jcabi.version}</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <artifactId>aspectjrt</artifactId>
             <groupId>org.aspectj</groupId>
-            <scope>compile</scope>
+            <artifactId>aspectjrt</artifactId>
             <version>${aspectjrt.version}</version>
+            <scope>compile</scope>
         </dependency>
 
 
         <!-- CAMBRIA CLIENT for U-EB -->
         <dependency>
+            <groupId>com.att.nsa</groupId>
             <artifactId>cambriaClient</artifactId>
+            <version>1.2.1-oss</version>
+            <scope>compile</scope>
             <exclusions>
                 <exclusion>
-                    <artifactId>saClientLibrary</artifactId>
                     <groupId>com.att.nsa</groupId>
+                    <artifactId>saClientLibrary</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>com.att.nsa</groupId>
-            <scope>compile</scope>
-            <version>1.2.1-oss</version>
         </dependency>
 
         <dependency>
-            <artifactId>json</artifactId>
             <groupId>org.json</groupId>
-            <scope>compile</scope>
-            <version>20131018</version>
+            <artifactId>json</artifactId>
+            <version>${org.json.version}</version>
         </dependency>
 
         <!-- CASSANDRA -->
         <dependency>
-            <artifactId>cassandra-driver-core</artifactId>
             <groupId>com.datastax.cassandra</groupId>
-            <scope>compile</scope>
+            <artifactId>cassandra-driver-core</artifactId>
             <version>${cassandra.driver.version}</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.github.jnr</groupId>
+                    <artifactId>jnr-posix</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
-            <artifactId>cassandra-driver-mapping</artifactId>
             <groupId>com.datastax.cassandra</groupId>
-            <scope>compile</scope>
+            <artifactId>cassandra-driver-mapping</artifactId>
             <version>${cassandra.driver.version}</version>
+            <scope>compile</scope>
         </dependency>
         <!-- CASSANDRA END -->
 
         <!-- Inserted for ECOMP Portal Integration -->
         <dependency>
+            <groupId>org.owasp.esapi</groupId>
             <artifactId>esapi</artifactId>
+            <version>${org.owasp.esapi.version}</version>
             <exclusions>
                 <exclusion>
-                    <artifactId>xercesImpl</artifactId>
-                    <groupId>xerces</groupId>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>log4j</artifactId>
-                    <groupId>log4j</groupId>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>commons-fileupload</artifactId>
                     <groupId>commons-fileupload</groupId>
+                    <artifactId>commons-fileupload</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>xmlgraphics-commons</artifactId>
                     <groupId>org.apache.xmlgraphics</groupId>
+                    <artifactId>xmlgraphics-commons</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>xml-apis-ext</artifactId>
                     <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis-ext</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>xml-apis</artifactId>
                     <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.sourceforge.nekohtml</groupId>
+                    <artifactId>nekohtml</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.owasp.esapi</groupId>
-            <version>${org.owasp.esapi.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.onap.portal.sdk</groupId>
             <artifactId>epsdk-fw</artifactId>
+            <version>${ecomp.version}</version>
+            <scope>compile</scope>
             <exclusions>
                 <exclusion>
-                    <artifactId>cambriaClient</artifactId>
                     <groupId>com.att.nsa</groupId>
+                    <artifactId>cambriaClient</artifactId>
                 </exclusion>
                 <exclusion>
                     <artifactId>slf4j-log4j12</artifactId>
                     <groupId>org.slf4j</groupId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>aaf-cadi-aaf</artifactId>
                     <groupId>org.onap.aaf.authz</groupId>
+                    <artifactId>aaf-cadi-aaf</artifactId>
                 </exclusion>
                 <exclusion>
                     <artifactId>aaf-cadi-core</artifactId>
@@ -937,72 +725,78 @@
                     <artifactId>log4j</artifactId>
                     <groupId>log4j</groupId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.onap.aaf.authz</groupId>
+                    <artifactId>aaf-cadi-aaf</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.onap.aaf.authz</groupId>
+                    <artifactId>aaf-cadi-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.onap.aaf.authz</groupId>
+                    <artifactId>aaf-cadi-core</artifactId>
+                </exclusion>
             </exclusions>
-            <groupId>org.onap.portal.sdk</groupId>
-            <scope>compile</scope>
-            <version>${ecomp.version}</version>
         </dependency>
 
         <!--Jetty Proxy-->
         <dependency>
-            <artifactId>jetty-http</artifactId>
             <groupId>org.eclipse.jetty</groupId>
-            <scope>compile</scope>
+            <artifactId>jetty-http</artifactId>
             <version>${jetty.version}</version>
+            <scope>compile</scope>
         </dependency>
 
         <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>
+            <artifactId>jetty-proxy</artifactId>
             <version>${jetty.version}</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
+            <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlets</artifactId>
+            <version>${jetty.version}</version>
+            <scope>compile</scope>
             <exclusions>
                 <exclusion>
-                    <artifactId>jetty-http</artifactId>
-                    <groupId>org.eclipse.jetty</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jetty-continuation</artifactId>
                     <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-http</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.eclipse.jetty</groupId>
-            <scope>compile</scope>
-            <version>${jetty.version}</version>
         </dependency>
         <!-- System metrics -->
         <dependency>
+            <groupId>org.fusesource</groupId>
             <artifactId>sigar</artifactId>
+            <version>${sigar.version}</version>
+            <scope>compile</scope>
             <exclusions>
                 <exclusion>
-                    <artifactId>log4j</artifactId>
                     <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.fusesource</groupId>
-            <scope>compile</scope>
-            <version>${sigar.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
             <artifactId>dmaapClient</artifactId>
+            <version>1.1.3</version>
+            <scope>compile</scope>
             <exclusions>
                 <exclusion>
-                    <artifactId>dme2</artifactId>
                     <groupId>com.att.aft</groupId>
+                    <artifactId>dme2</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>jackson-core</artifactId>
                     <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
                 </exclusion>
                 <exclusion>
                     <artifactId>log4j</artifactId>
@@ -1012,281 +806,609 @@
                     <artifactId>apache-log4j-extras</artifactId>
                     <groupId>log4j</groupId>
                 </exclusion>
-            </exclusions>
-            <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
-            <scope>compile</scope>
-            <version>1.1.3</version>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient-cache</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.ws.rs</groupId>
+                    <artifactId>javax.ws.rs-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
+            <groupId>com.att.aft</groupId>
             <artifactId>dme2</artifactId>
+            <version>3.1.200-oss</version>
             <exclusions>
                 <exclusion>
-                    <artifactId>jms</artifactId>
                     <groupId>javax.jms</groupId>
+                    <artifactId>jms</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>com.att.aft</groupId>
-            <version>3.1.200-oss</version>
         </dependency>
 
         <!-- CADI -->
         <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
             <artifactId>aaf-cadi-aaf</artifactId>
+            <version>${cadi.version}</version>
             <exclusions>
                 <exclusion>
-                    <artifactId>cassandra-driver-core</artifactId>
                     <groupId>com.datastax.cassandra</groupId>
+                    <artifactId>cassandra-driver-core</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>slf4j-log4j12</artifactId>
                     <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
                 <exclusion>
                     <artifactId>log4j</artifactId>
                     <groupId>log4j</groupId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </exclusion>
             </exclusions>
-            <groupId>org.onap.aaf.authz</groupId>
-            <version>${cadi.version}</version>
         </dependency>
 
         <!-- TEST -->
         <dependency>
-            <artifactId>assertj-core</artifactId>
             <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
 
         <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>
-                    <artifactId>jetty-server</artifactId>
-                    <groupId>org.eclipse.jetty</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jetty-continuation</artifactId>
-                    <groupId>org.eclipse.jetty</groupId>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.glassfish.jersey.test-framework.providers</groupId>
-            <scope>test</scope>
-            <type>pom</type>
-            <version>${jersey-bom.version}</version>
         </dependency>
 
         <dependency>
-            <artifactId>jersey-client</artifactId>
             <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-client</artifactId>
             <version>${jersey-bom.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>
+            <artifactId>jetty-webapp</artifactId>
             <version>${jetty.version}</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <artifactId>hamcrest</artifactId>
             <groupId>org.hamcrest</groupId>
-            <scope>test</scope>
+            <artifactId>hamcrest</artifactId>
             <version>${hamcrest.version}</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <artifactId>hamcrest-library</artifactId>
             <groupId>org.hamcrest</groupId>
-            <scope>test</scope>
+            <artifactId>hamcrest-library</artifactId>
             <version>${hamcrest.version}</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <artifactId>junit-jupiter-api</artifactId>
             <groupId>org.junit.jupiter</groupId>
-            <scope>test</scope>
+            <artifactId>junit-jupiter-api</artifactId>
             <version>${junitJupiter.version}</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <artifactId>junit-jupiter</artifactId>
             <groupId>org.junit.jupiter</groupId>
-            <scope>test</scope>
+            <artifactId>junit-jupiter</artifactId>
             <version>${junitJupiter.version}</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <artifactId>junit-platform-commons</artifactId>
             <groupId>org.junit.platform</groupId>
-            <scope>test</scope>
+            <artifactId>junit-platform-commons</artifactId>
             <version>${junit.platform.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
-            <artifactId>junit-platform-engine</artifactId>
             <groupId>org.junit.platform</groupId>
-            <scope>test</scope>
+            <artifactId>junit-platform-engine</artifactId>
             <version>${junit.platform.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
-            <artifactId>mockito-junit-jupiter</artifactId>
             <groupId>org.mockito</groupId>
-            <scope>test</scope>
+            <artifactId>mockito-junit-jupiter</artifactId>
             <version>${mockitoJupiter.version}</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <artifactId>spring-test</artifactId>
             <groupId>org.springframework</groupId>
-            <scope>test</scope>
+            <artifactId>spring-test</artifactId>
             <version>${spring.version}</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
+            <groupId>org.springframework</groupId>
             <artifactId>spring-tx</artifactId>
+            <version>${spring.version}</version>
             <exclusions>
                 <exclusion>
-                    <artifactId>spring-core</artifactId>
                     <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.springframework</groupId>
-            <version>${spring.version}</version>
         </dependency>
 
         <dependency>
-            <artifactId>cucumber-java</artifactId>
             <groupId>io.cucumber</groupId>
-            <scope>test</scope>
+            <artifactId>cucumber-java</artifactId>
             <version>${cucumber.version}</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <artifactId>cucumber-junit</artifactId>
             <groupId>io.cucumber</groupId>
-            <scope>test</scope>
+            <artifactId>cucumber-junit</artifactId>
             <version>${cucumber.version}</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <artifactId>jmockit</artifactId>
             <groupId>org.jmockit</groupId>
-            <scope>test</scope>
+            <artifactId>jmockit</artifactId>
             <version>${jmockit.version}</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <artifactId>bean-matchers</artifactId>
             <groupId>com.google.code.bean-matchers</groupId>
+            <artifactId>bean-matchers</artifactId>
+            <version>${bean-matchers.version}</version>
             <scope>test</scope>
-            <version>0.11</version>
         </dependency>
-
         <dependency>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy</artifactId>
-            <groupId>org.codehaus.groovy</groupId>
             <version>${groovy.version}</version>
         </dependency>
 
         <dependency>
-            <artifactId>netty-handler</artifactId>
             <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.onap.sdc.common</groupId>
             <artifactId>onap-tosca-datatype</artifactId>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
-                    <artifactId>jackson-core</artifactId>
                     <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.onap.sdc.common</groupId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
-            <artifactId>commons-collections4</artifactId>
             <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
             <version>${commons.collections.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.onap.sdc.sdc-be-common</groupId>
             <artifactId>security-util-lib</artifactId>
+            <version>${security.util.lib.version}</version>
             <exclusions>
                 <exclusion>
+                    <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+                <exclusion>
                     <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.onap.sdc.sdc-be-common</groupId>
-            <version>${security.util.lib.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.openecomp.sdc.core</groupId>
             <artifactId>openecomp-tosca-lib</artifactId>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
-                    <artifactId>jackson-core</artifactId>
                     <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>spring-core</artifactId>
                     <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.openecomp.sdc.core</groupId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.onap.vnfsdk.validation</groupId>
             <artifactId>validation-pmdictionary</artifactId>
+            <version>${onap.vnfsdk.validation.pmdictionary.version}</version>
             <exclusions>
                 <exclusion>
-                    <artifactId>log4j-slf4j-impl</artifactId>
                     <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-slf4j-impl</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>org.onap.vnfsdk.validation</groupId>
-            <version>${onap.vnfsdk.validation.pmdictionary.version}</version>
         </dependency>
 
         <dependency>
+            <groupId>com.googlecode.jmapper-framework</groupId>
             <artifactId>jmapper-core</artifactId>
+            <version>${jMapper.version}</version>
             <exclusions>
                 <exclusion>
-                    <artifactId>xstream</artifactId>
                     <groupId>com.thoughtworks.xstream</groupId>
+                    <artifactId>xstream</artifactId>
                 </exclusion>
             </exclusions>
-            <groupId>com.googlecode.jmapper-framework</groupId>
-            <version>${jMapper.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
         </dependency>
 
     </dependencies>
 
-    <modelVersion>4.0.0</modelVersion>
+    <build>
+        <finalName>catalog-be</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <forkCount>1C</forkCount>
+                    <reuseForks>false</reuseForks>
+                </configuration>
+            </plugin>
+            <plugin>
+                <!-- Download Swagger UI webjar. -->
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>${maven-dependency-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.webjars</groupId>
+                                    <artifactId>swagger-ui</artifactId>
+                                    <version>${swagger-ui.version}</version>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${project.build.directory}/swagger-ui</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <!-- Replace the OpenAPI specification example URL with the local one. -->
+                <groupId>com.google.code.maven-replacer-plugin</groupId>
+                <artifactId>replacer</artifactId>
+                <version>${replacer.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <file>
+                        ${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}/index.html
+                    </file>
+                    <replacements>
+                        <replacement>
+                            <token>https://petstore.swagger.io/v2/swagger.json</token>
+                            <value>/sdc/openapi.json</value>
+                        </replacement>
+                    </replacements>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <packagingExcludes>WEB-INF\lib\slf4j-log4j*.jar,
+                        WEB-INF/classes/elasticsearch.yml,
+                        WEB-INF/classes/portal.properties
+                    </packagingExcludes>
+                    <archive>
+                        <manifestEntries>
+                            <SDC-Version>${ui.version}</SDC-Version>
+                        </manifestEntries>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                    <attachClasses>true</attachClasses>
+                    <webResources combine.children="append">
+                        <resource>
+                            <directory>
+                                ${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}
+                            </directory>
+                            <includes>
+                                <include>**/*.*</include>
+                            </includes>
+                            <targetPath>swagger-ui</targetPath>
+                        </resource>
+                    </webResources>
+                </configuration>
+            </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>
+                                    <excludes>
+                                        <exclude>
+                                            src/test/resources/artifacts/pnfSoftwareInformation/**
+                                        </exclude>
+                                        <exclude>
+                                            src/test/resources/yamlValidation/noValid/**
+                                        </exclude>
+                                    </excludes>
+                                </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>
+            <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-assembly-plugin</artifactId>
+                <version>${mvn.assembly.version}</version>
+                <executions>
+                    <execution>
+                        <id>normatives</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <finalName>normatives</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>src/main/assembly/normatives.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>clean.sdc.backend.folder</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                        <configuration>
+                            <filesets>
+                                <fileset>
+                                    <directory>
+                                        sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default
+                                    </directory>
+                                    <followSymlinks>false</followSymlinks>
+                                    <includes>
+                                        <include>normatives.tar.gz</include>
+                                    </includes>
+                                </fileset>
+                            </filesets>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>io.swagger.core.v3</groupId>
+                <artifactId>swagger-maven-plugin</artifactId>
+                <version>${swagger-core-mvn-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>sdce-2-sdce-5</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>resolve</goal>
+                        </goals>
+                        <configuration>
+                            <contextId>sdce-2-sdce-5</contextId>
+                            <outputPath>${project.build.directory}/generated/openapi</outputPath>
+                            <outputFileName>openapi-sdce-2-sdce-5</outputFileName>
+                            <outputFormat>JSONANDYAML</outputFormat>
+                            <configurationFilePath>
+                                ${project.basedir}/src/main/resources/swagger-config/sdce-2-sdce-5.yaml
+                            </configurationFilePath>
+                            <skip>${swagger.skip}</skip>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>sdce-4</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>resolve</goal>
+                        </goals>
+                        <configuration>
+                            <contextId>sdce-4</contextId>
+                            <outputPath>${project.build.directory}/generated/openapi</outputPath>
+                            <outputFileName>openapi-sdce-4</outputFileName>
+                            <outputFormat>JSONANDYAML</outputFormat>
+                            <configurationFilePath>
+                                ${project.basedir}/src/main/resources/swagger-config/sdce-4.yaml
+                            </configurationFilePath>
+                            <skip>${swagger.skip}</skip>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>sdce-6</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>resolve</goal>
+                        </goals>
+                        <configuration>
+                            <contextId>sdce-6</contextId>
+                            <outputPath>${project.build.directory}/generated/openapi</outputPath>
+                            <outputFileName>openapi-sdce-6</outputFileName>
+                            <outputFormat>JSONANDYAML</outputFormat>
+                            <configurationFilePath>
+                                ${project.basedir}/src/main/resources/swagger-config/sdce-6.yaml
+                            </configurationFilePath>
+                            <skip>${swagger.skip}</skip>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>sdce-7</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>resolve</goal>
+                        </goals>
+                        <configuration>
+                            <contextId>sdce-7</contextId>
+                            <outputPath>${project.build.directory}/generated/openapi</outputPath>
+                            <outputFileName>openapi-sdce-7</outputFileName>
+                            <outputFormat>JSONANDYAML</outputFormat>
+                            <configurationFilePath>
+                                ${project.basedir}/src/main/resources/swagger-config/sdce-7.yaml
+                            </configurationFilePath>
+                            <skip>${swagger.skip}</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.googlecode.maven-download-plugin</groupId>
+                                        <artifactId>download-maven-plugin</artifactId>
+                                        <versionRange>[1.2.1,)</versionRange>
+                                        <goals>
+                                            <goal>wget</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                </pluginExecution>
 
-    <packaging>war</packaging>
+                                <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>
 
-    <parent>
-        <artifactId>sdc-main</artifactId>
-        <groupId>org.openecomp.sdc</groupId>
-        <version>1.10.0-SNAPSHOT</version>
-    </parent>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <!-- Swagger Plugins End -->
+    </build>
 
     <profiles>
         <profile>
+            <id>docker</id>
             <activation>
                 <activeByDefault>false</activeByDefault>
             </activation>
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-resources-plugin</artifactId>
                         <executions>
                             <execution>
+                                <id>copy-normatives</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
                                 <configuration>
                                     <outputDirectory>
                                         sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default
@@ -1300,13 +1422,13 @@
                                         </resource>
                                     </resources>
                                 </configuration>
+                            </execution>
+                            <execution>
+                                <id>copy-sdc-be-py</id>
+                                <phase>verify</phase>
                                 <goals>
                                     <goal>copy-resources</goal>
                                 </goals>
-                                <id>copy-normatives</id>
-                                <phase>package</phase>
-                            </execution>
-                            <execution>
                                 <configuration>
                                     <outputDirectory>
                                         sdc-backend-init/
@@ -1323,35 +1445,29 @@
                                         </resource>
                                     </resources>
                                 </configuration>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <id>copy-sdc-be-py</id>
-                                <phase>verify</phase>
                             </execution>
                         </executions>
-                        <groupId>org.apache.maven.plugins</groupId>
                     </plugin>
                     <plugin>
+                        <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
                         <configuration>
+                            <verbose>${verbose}</verbose>
                             <apiVersion>${docker.api.version}</apiVersion>
+                            <registry>${docker.registry}</registry>
                             <authConfig>
                                 <pull>
-                                    <password>docker</password>
-                                    <username>docker</username>
+                                    <username>${docker.username}</username>
+                                    <password>${docker.password}</password>
                                 </pull>
                             </authConfig>
                             <images>
 
                                 <!-- Build backend image -->
                                 <image>
+                                    <name>${docker.namespace}/sdc-backend</name>
                                     <alias>sdc-backend</alias>
                                     <build>
-                                        <assembly>
-                                            <descriptor>backend/backend-files.xml</descriptor>
-                                            <name>onap-sdc-backend</name>
-                                        </assembly>
                                         <cleanup>try</cleanup>
                                         <dockerFileDir>backend</dockerFileDir>
                                         <tags>
@@ -1363,11 +1479,15 @@
                                                 ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}
                                             </tag>
                                         </tags>
+                                        <assembly>
+                                            <descriptor>backend/backend-files.xml</descriptor>
+                                            <name>onap-sdc-backend</name>
+                                        </assembly>
                                     </build>
-                                    <name>onap/sdc-backend</name>
                                 </image>
                                 <!-- Build backend-init image -->
                                 <image>
+                                    <name>${docker.namespace}/sdc-backend-init</name>
                                     <alias>sdc-backend-init</alias>
                                     <build>
                                         <cleanup>try</cleanup>
@@ -1383,57 +1503,44 @@
                                             </tag>
                                         </tags>
                                     </build>
-                                    <name>onap/sdc-backend-init</name>
                                 </image>
                             </images>
-                            <registry>nexus3.onap.org:10001</registry>
-                            <verbose>${verbose}</verbose>
                         </configuration>
                         <executions>
                             <execution>
-                                <configuration>
-                                    <image>onap/sdc-backend,onap/sdc-backend-init</image>
-                                    <removeAll>true</removeAll>
-                                </configuration>
+                                <id>clean-images</id>
+                                <phase>pre-clean</phase>
                                 <goals>
                                     <goal>remove</goal>
                                 </goals>
-                                <id>clean-images</id>
-                                <phase>pre-clean</phase>
+                                <configuration>
+                                    <removeAll>true</removeAll>
+                                    <image>${docker.namespace}/sdc-backend,onap/sdc-backend-init</image>
+                                </configuration>
                             </execution>
 
                             <execution>
+                                <id>generate-images</id>
+                                <phase>install</phase>
                                 <goals>
                                     <goal>build</goal>
                                 </goals>
-                                <id>generate-images</id>
-                                <phase>install</phase>
                             </execution>
 
                             <execution>
-                                <configuration>
-                                    <image>onap/sdc-backend,onap/sdc-backend-init</image>
-                                </configuration>
+                                <id>push-images</id>
+                                <phase>deploy</phase>
                                 <goals>
                                     <goal>push</goal>
                                 </goals>
-                                <id>push-images</id>
-                                <phase>deploy</phase>
+                                <configuration>
+                                    <image>${docker.namespace}/sdc-backend,onap/sdc-backend-init</image>
+                                </configuration>
                             </execution>
                         </executions>
-                        <groupId>io.fabric8</groupId>
                     </plugin>
                 </plugins>
             </build>
-            <id>docker</id>
         </profile>
     </profiles>
-
-    <properties>
-        <java-hamcrest.version>2.0.0.0</java-hamcrest.version>
-        <maven-dependency-plugin.version>3.2.0</maven-dependency-plugin.version>
-        <replacer.plugin.version>1.5.3</replacer.plugin.version>
-        <swagger-ui.version>3.25.0</swagger-ui.version>
-        <swagger.version>${swagger-core-mvn-plugin.version}</swagger.version>
-    </properties>
 </project>