X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog-be%2Fpom.xml;h=8cdf533e6c4a4342806fcbf2632eb61c6172581e;hb=eb69d6f1d056fc2c4e9338f2460ca9ca7b9504f3;hp=dae98642a4dc265700867c6f5b88341d1202bfe5;hpb=cdca700bbc71af59acfe340b54d464f28206bb79;p=sdc.git

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index dae98642a4..8cdf533e6c 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -1,6 +1,6 @@
 <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">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>catalog-be</artifactId>
@@ -9,31 +9,65 @@
     <parent>
         <groupId>org.openecomp.sdc</groupId>
         <artifactId>sdc-main</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.12.2-SNAPSHOT</version>
     </parent>
 
     <properties>
         <java-hamcrest.version>2.0.0.0</java-hamcrest.version>
-        <swagger.version>2.1.1</swagger.version>
+        <swagger.version>${swagger-core-mvn-plugin.version}</swagger.version>
         <swagger-ui.version>3.25.0</swagger-ui.version>
-        <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.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>
 
     <dependencies>
+        <dependency>
+            <groupId>org.openecomp.sdc</groupId>
+            <artifactId>togglz-rest-services</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.woodstox</groupId>
+                    <artifactId>woodstox-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>${jsoup.version}</version>
+        </dependency>
+
         <!--JSON and YAML Parsing-->
+        <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>
-            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.version}</version>
-            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -48,6 +82,16 @@
             <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-jaxrs2</artifactId>
             <version>${swagger.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.github.classgraph</groupId>
+                    <artifactId>classgraph</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
@@ -56,11 +100,60 @@
         </dependency>
         <!-- Swagger Dependencies End -->
 
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>${hibernate.validator.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>${jetty.version}</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-http</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-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>
-            <scope>compile</scope>
+            <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>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <version>${ws.rs.version}</version>
         </dependency>
 
         <dependency>
@@ -68,28 +161,63 @@
             <artifactId>common-be</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.openecomp.sdc.be</groupId>
-            <artifactId>common-be</artifactId>
+            <artifactId>common-be-tests-utils</artifactId>
             <version>${project.version}</version>
-            <type>test-jar</type>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <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>
         </dependency>
         <dependency>
             <groupId>org.openecomp.sdc.be</groupId>
             <artifactId>catalog-dao</artifactId>
             <version>${project.version}</version>
-            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>org.openecomp.sdc.be</groupId>
             <artifactId>catalog-model</artifactId>
             <version>${project.version}</version>
-            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
+      <dependency>
+          <groupId>io.micrometer</groupId>
+          <artifactId>micrometer-registry-prometheus</artifactId>
+          <version>${micrometer.version}</version>
+      </dependency>
+
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
@@ -111,6 +239,12 @@
             <artifactId>commons-jci-core</artifactId>
             <version>${commons-jci-core.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- Gson -->
@@ -126,7 +260,12 @@
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-json-jackson</artifactId>
             <version>${jersey-bom.version}</version>
-            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -168,6 +307,10 @@
                     <groupId>org.springframework</groupId>
                     <artifactId>spring-context</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-validator</artifactId>
+                </exclusion>
             </exclusions>
 
         </dependency>
@@ -182,6 +325,21 @@
         <dependency>
             <groupId>org.glassfish.jersey.ext</groupId>
             <artifactId>jersey-bean-validation</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-validator</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.glassfish</groupId>
+                    <artifactId>jakarta.el</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.el</artifactId>
+            <version>${jakarta.el.version}</version>
         </dependency>
 
         <!-- http client -->
@@ -190,6 +348,12 @@
             <artifactId>httpclient</artifactId>
             <version>${httpclient.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpcore</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -240,6 +404,16 @@
             <artifactId>spring-context</artifactId>
             <version>${spring.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-expression</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -247,6 +421,12 @@
             <artifactId>spring-web</artifactId>
             <version>${spring.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -254,6 +434,20 @@
             <artifactId>spring-webmvc</artifactId>
             <version>${spring.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-expression</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-web</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -261,6 +455,12 @@
             <artifactId>spring-aop</artifactId>
             <version>${spring.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -311,6 +511,14 @@
             <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>
                     <groupId>org.json</groupId>
                     <artifactId>json</artifactId>
@@ -327,6 +535,22 @@
                     <groupId>org.apache.thrift</groupId>
                     <artifactId>libthrift</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -415,8 +639,7 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20131018</version>
-            <scope>compile</scope>
+            <version>${org.json.version}</version>
         </dependency>
 
         <!-- CASSANDRA -->
@@ -425,6 +648,12 @@
             <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>
             <groupId>com.datastax.cassandra</groupId>
@@ -432,14 +661,48 @@
             <version>${cassandra.driver.version}</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.thrift</groupId>
-            <artifactId>libthrift</artifactId>
-            <version>${libthrift.version}</version>
-        </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>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-fileupload</groupId>
+                    <artifactId>commons-fileupload</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.xmlgraphics</groupId>
+                    <artifactId>xmlgraphics-commons</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis-ext</artifactId>
+                </exclusion>
+                <exclusion>
+                    <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>
+        </dependency>
         <dependency>
             <groupId>org.onap.portal.sdk</groupId>
             <artifactId>epsdk-fw</artifactId>
@@ -455,12 +718,8 @@
                     <groupId>org.slf4j</groupId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>powermock-api-mockito</artifactId>
-                    <groupId>org.powermock</groupId>
-                </exclusion>
-                <exclusion>
-                    <groupId> org.onap.aaf.authz</groupId>
-                    <artifactId> aaf-cadi-aaf</artifactId>
+                    <groupId>org.onap.aaf.authz</groupId>
+                    <artifactId>aaf-cadi-aaf</artifactId>
                 </exclusion>
                 <exclusion>
                     <artifactId>aaf-cadi-core</artifactId>
@@ -470,10 +729,21 @@
                     <artifactId>commons-codec</artifactId>
                     <groupId>commons-codec</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>log4j</artifactId>
+                    <groupId>log4j</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
 
         <!--Jetty Proxy-->
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-http</artifactId>
+            <version>${jetty.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-proxy</artifactId>
@@ -486,6 +756,12 @@
             <artifactId>jetty-servlets</artifactId>
             <version>${jetty.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-http</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- System metrics -->
         <dependency>
@@ -493,6 +769,12 @@
             <artifactId>sigar</artifactId>
             <version>${sigar.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
@@ -504,37 +786,56 @@
                     <groupId>com.att.aft</groupId>
                     <artifactId>dme2</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>log4j</artifactId>
+                    <groupId>log4j</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>apache-log4j-extras</artifactId>
+                    <groupId>log4j</groupId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient-cache</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
             <groupId>com.att.aft</groupId>
             <artifactId>dme2</artifactId>
             <version>3.1.200-oss</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.jms</groupId>
+                    <artifactId>jms</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
+        <!-- CADI -->
         <dependency>
-            <groupId>javax.jms</groupId>
-            <artifactId>jms</artifactId>
-            <version>1.1</version>
-            <scope>provided</scope>
-        </dependency>
-
-         <!-- CADI -->
-        <dependency>
-			<groupId>org.onap.aaf.authz</groupId>
-			<artifactId>aaf-cadi-aaf</artifactId>
-   			<version>${cadi.version}</version>
-   			<exclusions>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-aaf</artifactId>
+            <version>${cadi.version}</version>
+            <exclusions>
                 <exclusion>
-                     <groupId>com.datastax.cassandra</groupId>
-                     <artifactId>cassandra-driver-core</artifactId>
+                    <groupId>com.datastax.cassandra</groupId>
+                    <artifactId>cassandra-driver-core</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
-             </exclusions>
-		 </dependency>
+                <exclusion>
+                    <artifactId>log4j</artifactId>
+                    <groupId>log4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
         <!-- TEST -->
         <dependency>
@@ -558,28 +859,56 @@
         </dependency>
 
         <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-standalone</artifactId>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-webapp</artifactId>
+            <version>${jetty.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-webapp</artifactId>
-            <version>${jetty.version}</version>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest</artifactId>
+            <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <version>${hamcrest.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junitJupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junitJupiter.version}</version>
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
+            <version>${junit.platform.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-engine</artifactId>
+            <version>${junit.platform.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>${mockitoJupiter.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -594,17 +923,25 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-tx</artifactId>
             <version>${spring.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-java</artifactId>
+            <version>${cucumber.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-junit</artifactId>
+            <version>${cucumber.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -622,17 +959,10 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>java-hamcrest</artifactId>
-            <version>${java-hamcrest.version}</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy</artifactId>
-            <version>2.4.8</version>
+            <version>${groovy.version}</version>
         </dependency>
 
         <dependency>
@@ -643,6 +973,12 @@
             <groupId>org.onap.sdc.common</groupId>
             <artifactId>onap-tosca-datatype</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -650,20 +986,81 @@
             <version>${commons.collections.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-            <version>${jackson.mapper.version}</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+            <version>${spring.boot.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>
         </dependency>
+        <dependency>
+            <groupId>org.openecomp.sdc.core</groupId>
+            <artifactId>openecomp-tosca-lib</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.vnfsdk.validation</groupId>
+            <artifactId>validation-pmdictionary</artifactId>
+            <version>${onap.vnfsdk.validation.pmdictionary.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-slf4j-impl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.googlecode.jmapper-framework</groupId>
+            <artifactId>jmapper-core</artifactId>
+            <version>${jMapper.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.thoughtworks.xstream</groupId>
+                    <artifactId>xstream</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
-        <finalName>${project.artifactId}-${project.version}</finalName>
+        <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>
@@ -701,7 +1098,9 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <file>${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}/index.html</file>
+                    <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>
@@ -720,7 +1119,7 @@
                     </packagingExcludes>
                     <archive>
                         <manifestEntries>
-                            <SDC-Version>${project.version}</SDC-Version>
+                            <SDC-Version>${ui.version}</SDC-Version>
                         </manifestEntries>
                         <manifest>
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
@@ -730,7 +1129,9 @@
                     <attachClasses>true</attachClasses>
                     <webResources combine.children="append">
                         <resource>
-                            <directory>${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}</directory>
+                            <directory>
+                                ${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}
+                            </directory>
                             <includes>
                                 <include>**/*.*</include>
                             </includes>
@@ -757,7 +1158,9 @@
                                         <include>src/test/resources/**/*.y*ml</include>
                                     </includes>
                                     <excludes>
-                                        <exclude>src/test/resources/artifacts/pnfSoftwareInformation/**</exclude>
+                                        <exclude>
+                                            src/test/resources/artifacts/pnfSoftwareInformation/**
+                                        </exclude>
                                     </excludes>
                                 </validationSet>
                                 <validationSet>
@@ -767,6 +1170,7 @@
                                     </includes>
                                 </validationSet>
                             </validationSets>
+                            <skip>${skipYamlJsonValidator}</skip>
                         </configuration>
                     </execution>
                 </executions>
@@ -775,6 +1179,18 @@
                 <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>
@@ -815,30 +1231,9 @@
                         </goals>
                         <configuration>
                             <filesets>
-                                <!-- static configuration files -->
-                                <fileset>
-                                    <directory>
-                                        ${project.parent.basedir}/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default
-                                    </directory>
-                                    <followSymlinks>false</followSymlinks>
-                                    <includes>
-                                        <include>Artifact-Generator.properties</include>
-                                        <include>error-configuration.yaml</include>
-                                        <include>ecomp-error-configuration.yaml</include>
-                                        <include>logback.xml</include>
-                                    </includes>
-                                </fileset>
-                                <!-- BE WAR's -->
-                                <fileset>
-                                    <directory>${project.parent.basedir}/catalog-be/sdc-backend</directory>
-                                    <followSymlinks>false</followSymlinks>
-                                    <includes>
-                                        <include>*.war</include>
-                                    </includes>
-                                </fileset>
                                 <fileset>
                                     <directory>
-                                        ${project.basedir}/sdc-backend-init/chef-repo/cookbooks/sdc-normatives/files/default
+                                        sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default
                                     </directory>
                                     <followSymlinks>false</followSymlinks>
                                     <includes>
@@ -848,68 +1243,79 @@
                             </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>clean-static-files</id>
-                        <phase>clean</phase>
+                        <id>sdce-2-sdce-5</id>
+                        <phase>compile</phase>
                         <goals>
-                            <goal>clean</goal>
+                            <goal>resolve</goal>
                         </goals>
                         <configuration>
-                            <filesets>
-                                <!-- tosca files -->
-                                <fileset>
-                                    <directory>${project.parent.basedir}/asdctool/tosca</directory>
-                                    <followSymlinks>false</followSymlinks>
-                                </fileset>
-                            </filesets>
+                            <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>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
                     <execution>
-                        <id>copy-static-configuration-files</id>
-                        <phase>verify</phase>
+                        <id>sdce-4</id>
+                        <phase>compile</phase>
                         <goals>
-                            <goal>copy-resources</goal>
+                            <goal>resolve</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>
-                                ${project.parent.basedir}/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default
-                            </outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${project.parent.basedir}/catalog-be/src/main/resources/config
-                                    </directory>
-                                    <includes>
-                                        <include>Artifact-Generator.properties</include>
-                                        <include>error-configuration.yaml</include>
-                                        <include>ecomp-error-configuration.yaml</include>
-                                        <include>logback.xml</include>
-                                    </includes>
-                                </resource>
-                            </resources>
+                            <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>copy-tosca-folder</id>
-                        <!-- here the phase you need -->
-                        <phase>install</phase>
+                        <id>sdce-6</id>
+                        <phase>compile</phase>
                         <goals>
-                            <goal>copy-resources</goal>
+                            <goal>resolve</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${project.parent.basedir}/asdctool/tosca</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${project.parent.basedir}/catalog-be/src/main/resources/import/tosca
-                                    </directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
+                            <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>
@@ -936,9 +1342,6 @@
                                             <goal>wget</goal>
                                         </goals>
                                     </pluginExecutionFilter>
-                                    <action>
-                                        <ignore></ignore>
-                                    </action>
                                 </pluginExecution>
 
                                 <pluginExecution>
@@ -965,14 +1368,6 @@
     </build>
 
     <profiles>
-        <profile>
-            <id>docker-staging</id>
-            <properties>
-                <docker.tag>${project.version}-STAGING-${maven.build.timestamp}</docker.tag>
-                <docker.latest.tag>${project.version}-STAGING-latest</docker.latest.tag>
-            </properties>
-        </profile>
-
         <profile>
             <id>docker</id>
             <activation>
@@ -980,76 +1375,48 @@
             </activation>
             <build>
                 <plugins>
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.8</version>
-                        <executions>
-                            <execution>
-                                <id>copy-context-file</id>
-                                <phase>validate</phase>
-                                <configuration>
-                                    <target>
-                                        <copy file="sdc-backend/context.xml.template" tofile="sdc-backend/context.xml"/>
-                                    </target>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>set-version-in-context-file</id>
-                                <phase>generate-resources</phase>
-                                <configuration>
-                                    <target>
-                                        <replace file="sdc-backend/context.xml">
-                                            <replacetoken>projectversion</replacetoken>
-                                            <replacevalue>${project.version}</replacevalue>
-                                        </replace>
-                                    </target>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                               </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-resources-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>copy-resources-be</id>
-                                <phase>verify</phase>
+                                <id>copy-normatives</id>
+                                <phase>package</phase>
                                 <goals>
                                     <goal>copy-resources</goal>
                                 </goals>
                                 <configuration>
-                                    <outputDirectory>${basedir}/sdc-backend</outputDirectory>
+                                    <outputDirectory>
+                                        sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default
+                                    </outputDirectory>
                                     <resources>
                                         <resource>
-                                            <directory>${project.parent.basedir}/catalog-be/target</directory>
+                                            <directory>${project.build.directory}</directory>
                                             <includes>
-                                                <include>catalog-be-${project.version}.war</include>
+                                                <include>normatives.tar.gz</include>
                                             </includes>
                                         </resource>
                                     </resources>
                                 </configuration>
                             </execution>
                             <execution>
-                                <id>copy-normatives</id>
-                                <phase>package</phase>
+                                <id>copy-sdc-be-py</id>
+                                <phase>verify</phase>
                                 <goals>
                                     <goal>copy-resources</goal>
                                 </goals>
                                 <configuration>
                                     <outputDirectory>
-                                        sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default
+                                        sdc-backend-init/
                                     </outputDirectory>
                                     <resources>
                                         <resource>
-                                            <directory>${project.parent.basedir}/catalog-be/target</directory>
+                                            <directory>
+                                                ${project.parent.basedir}/catalog-be/src/main/resources/
+                                            </directory>
                                             <includes>
-                                                <include>normatives.tar.gz</include>
+                                                <include>scripts/sdcBePy/**</include>
+                                                <inculde>scripts/setup.py</inculde>
                                             </includes>
                                         </resource>
                                     </resources>
@@ -1061,43 +1428,55 @@
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
                         <configuration>
-                            <apiVersion>1.23</apiVersion>
-                            <registry>nexus3.onap.org:10001</registry>
+                            <verbose>${verbose}</verbose>
+                            <apiVersion>${docker.api.version}</apiVersion>
+                            <registry>${docker.registry}</registry>
                             <authConfig>
                                 <pull>
-                                    <username>docker</username>
-                                    <password>docker</password>
+                                    <username>${docker.username}</username>
+                                    <password>${docker.password}</password>
                                 </pull>
                             </authConfig>
                             <images>
 
                                 <!-- Build backend image -->
                                 <image>
-                                    <name>onap/sdc-backend</name>
+                                    <name>${docker.namespace}/sdc-backend</name>
                                     <alias>sdc-backend</alias>
                                     <build>
                                         <cleanup>try</cleanup>
-                                        <dockerFileDir>${project.basedir}/sdc-backend</dockerFileDir>
+                                        <dockerFileDir>backend</dockerFileDir>
                                         <tags>
-                                            <tag>${docker.tag}</tag>
+                                            <tag>latest</tag>
                                             <tag>
                                                 ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
                                             </tag>
+                                            <tag>
+                                                ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}
+                                            </tag>
                                         </tags>
+                                        <assembly>
+                                            <descriptor>backend/backend-files.xml</descriptor>
+                                            <name>onap-sdc-backend</name>
+                                        </assembly>
                                     </build>
                                 </image>
                                 <!-- Build backend-init image -->
                                 <image>
-                                    <name>onap/sdc-backend-init</name>
+                                    <name>${docker.namespace}/sdc-backend-init</name>
                                     <alias>sdc-backend-init</alias>
                                     <build>
                                         <cleanup>try</cleanup>
-                                        <dockerFileDir>${project.basedir}/sdc-backend-init</dockerFileDir>
+                                        <dockerFileDir>${project.basedir}/sdc-backend-init
+                                        </dockerFileDir>
                                         <tags>
-                                            <tag>${docker.tag}</tag>
+                                            <tag>latest</tag>
                                             <tag>
                                                 ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
                                             </tag>
+                                            <tag>
+                                                ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}
+                                            </tag>
                                         </tags>
                                     </build>
                                 </image>
@@ -1112,7 +1491,7 @@
                                 </goals>
                                 <configuration>
                                     <removeAll>true</removeAll>
-                                    <image>onap/sdc-backend,onap/sdc-backend-init</image>
+                                    <image>${docker.namespace}/sdc-backend,onap/sdc-backend-init</image>
                                 </configuration>
                             </execution>
 
@@ -1131,7 +1510,7 @@
                                     <goal>push</goal>
                                 </goals>
                                 <configuration>
-                                    <image>onap/sdc-backend,onap/sdc-backend-init</image>
+                                    <image>${docker.namespace}/sdc-backend,onap/sdc-backend-init</image>
                                 </configuration>
                             </execution>
                         </executions>