Merge "Prepare for java 11"

113 files changed, 511 insertions, 441 deletions

diff --git a/.gitattributes b/.gitattributes
index 41292170cf..5191c0fad5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13,7 +13,7 @@
 *.xml text
 *.sql text
 *.bpmn text
-
+*.sh text eol=lf
 # Declare files that will always have CRLF line endings on checkout.
 
 
diff --git a/adapters/etsi-sol002-adapter/pom.xml b/adapters/etsi-sol002-adapter/pom.xml
index b419d8806b..81e35d896d 100644
--- a/adapters/etsi-sol002-adapter/pom.xml
+++ b/adapters/etsi-sol002-adapter/pom.xml
@@ -17,12 +17,6 @@
 
   <name>ETSI SOL002 Application Jar</name>
 
-  <properties>
-    <java.version>1.8</java.version>
-    <maven.compiler.source>${java.version}</maven.compiler.source>
-    <maven.compiler.target>${java.version}</maven.compiler.target>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/adapters/etsi-sol003-adapter/pom.xml b/adapters/etsi-sol003-adapter/pom.xml
index 6c3a1f5b1c..fe34ff47c3 100644
--- a/adapters/etsi-sol003-adapter/pom.xml
+++ b/adapters/etsi-sol003-adapter/pom.xml
@@ -19,7 +19,7 @@
     <retrofit-version>2.3.0</retrofit-version>
     <threetenbp-version>1.3.5</threetenbp-version>
     <oltu-version>1.0.1</oltu-version>
-    <swagger-core-version>1.5.15</swagger-core-version>
+    <swagger-core-version>1.5.21</swagger-core-version>
     <okhttp3-version>3.14.0</okhttp3-version>
     <okhttp-version>2.7.5</okhttp-version>
     <okio-version>1.13.0</okio-version>
@@ -32,4 +32,4 @@
     <module>etsi-sol003-lcm</module>
     <module>etsi-sol003-adapter-application</module>
   </modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/adapters/mso-adapter-utils/pom.xml b/adapters/mso-adapter-utils/pom.xml
index a121d2d89b..0168d2bde5 100644
--- a/adapters/mso-adapter-utils/pom.xml
+++ b/adapters/mso-adapter-utils/pom.xml
@@ -113,12 +113,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.jmockit</groupId>
-      <artifactId>jmockit</artifactId>
-      <version>1.8</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.yaml</groupId>
       <artifactId>snakeyaml</artifactId>
     </dependency>
diff --git a/adapters/mso-adapters-rest-interface/pom.xml b/adapters/mso-adapters-rest-interface/pom.xml
index 584c47fea6..3b762413ae 100644
--- a/adapters/mso-adapters-rest-interface/pom.xml
+++ b/adapters/mso-adapters-rest-interface/pom.xml
@@ -18,7 +18,8 @@
     <plugins>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.6</version>
+        <!--<version>2.6</version>-->
+        <version>3.0.2</version>
         <configuration>
           <classesDirectory>target/classes</classesDirectory>
         </configuration>
diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml
index 5b3038fac7..0201dd6776 100644
--- a/adapters/mso-catalog-db-adapter/pom.xml
+++ b/adapters/mso-catalog-db-adapter/pom.xml
@@ -13,7 +13,6 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <java.version>1.8</java.version>
     <swagger.version>2.0.8</swagger.version>
   </properties>
   <build>
@@ -56,19 +55,6 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.3</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-          <fork>true</fork>
-          <compilerArgs>
-            <arg>-parameters</arg>
-          </compilerArgs>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <executions>
           <execution>
@@ -189,7 +175,12 @@
     <dependency>
       <groupId>uk.co.blackpepper.bowman</groupId>
       <artifactId>bowman-client</artifactId>
-      <version>0.3.0</version>
+      <version>${bowman.client.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <version>3.25.0-GA</version>
     </dependency>
     <dependency>
       <groupId>ch.vorburger.mariaDB4j</groupId>
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/TaskServices.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/TaskServices.java
index d282046b3f..db9a7cefae 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/TaskServices.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/TaskServices.java
@@ -22,7 +22,6 @@ package org.onap.so.adapters.tasks;
 
 import javax.annotation.PostConstruct;
 import org.camunda.bpm.client.ExternalTaskClient;
-import org.onap.so.utils.ExternalTaskServiceUtils;
 import org.onap.so.adapters.tasks.audit.AuditCreateStackService;
 import org.onap.so.adapters.tasks.audit.AuditDeleteStackService;
 import org.onap.so.adapters.tasks.audit.AuditQueryStackService;
@@ -30,6 +29,7 @@ import org.onap.so.adapters.tasks.inventory.CreateInventoryTask;
 import org.onap.so.adapters.tasks.orchestration.PollService;
 import org.onap.so.adapters.tasks.orchestration.RollbackService;
 import org.onap.so.adapters.tasks.orchestration.StackService;
+import org.onap.so.utils.ExternalTaskServiceUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -94,10 +94,10 @@ public class TaskServices {
     }
 
     @PostConstruct
-    public void auditAAIInventory() throws Exception {
+    public void createtAAIInventory() throws Exception {
         for (int i = 0; i < externalTaskServiceUtils.getMaxClients(); i++) {
             ExternalTaskClient client = externalTaskServiceUtils.createExternalTaskClient();
-            client.subscribe("InventoryCreate").lockDuration(externalTaskServiceUtils.getLockDuration())
+            client.subscribe("InventoryCreate").lockDuration(externalTaskServiceUtils.getLongLockDuration())
                     .handler(createInventory::executeExternalTask).open();
         }
     }
diff --git a/adapters/mso-requests-db-adapter/.gitignore b/adapters/mso-requests-db-adapter/.gitignore
index ae3c172604..9920c72893 100644
--- a/adapters/mso-requests-db-adapter/.gitignore
+++ b/adapters/mso-requests-db-adapter/.gitignore
@@ -1 +1,2 @@
 /bin/
+/.apt_generated_tests/
diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml
index 3463642382..ba179b6717 100644
--- a/adapters/mso-requests-db-adapter/pom.xml
+++ b/adapters/mso-requests-db-adapter/pom.xml
@@ -108,25 +108,58 @@
       <artifactId>cxf-logging</artifactId>
       <version>${project.version}</version>
     </dependency>
-  </dependencies>
 
+
+  </dependencies>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache.snapshots</id>
+      <name>Maven Plugin Snapshots</name>
+      <url>http://repository.apache.org/snapshots/</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
   <build>
     <finalName>${project.artifactId}-${project.version}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-java2ws-plugin</artifactId>
-        <version>${cxf.version}</version>
+        <version>3.3.3</version>
         <dependencies>
           <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>${cxf.version}</version>
+            <version>3.3.3</version>
           </dependency>
           <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-simple</artifactId>
-            <version>${cxf.version}</version>
+            <version>3.3.3</version>
+          </dependency>
+
+          <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-ri</artifactId>
+            <version>2.3.0</version>
+            <type>pom</type>
+          </dependency>
+          <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+          </dependency>
+          <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.4.0-b180725.0427</version>
+          </dependency>
+          <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>2.4.0-b180725.0644</version>
           </dependency>
         </dependencies>
         <executions>
@@ -137,6 +170,9 @@
               <className>org.onap.so.adapters.requestsdb.MsoRequestsDbAdapter</className>
               <genWsdl>true</genWsdl>
               <verbose>true</verbose>
+              <ignoredDependencies>
+                <ignoredDependency>com.sun.xml.bind:jaxb-impl</ignoredDependency>
+              </ignoredDependencies>
             </configuration>
             <goals>
               <goal>java2ws</goal>
diff --git a/adapters/mso-sdnc-adapter/.gitignore b/adapters/mso-sdnc-adapter/.gitignore
new file mode 100644
index 0000000000..da7560e07f
--- /dev/null
+++ b/adapters/mso-sdnc-adapter/.gitignore
@@ -0,0 +1 @@
+/.apt_generated_tests/
diff --git a/adapters/mso-sdnc-adapter/pom.xml b/adapters/mso-sdnc-adapter/pom.xml
index 3b76c23ae6..0c320faf8a 100644
--- a/adapters/mso-sdnc-adapter/pom.xml
+++ b/adapters/mso-sdnc-adapter/pom.xml
@@ -134,6 +134,26 @@
 
   <dependencies>
     <dependency>
+      <groupId>com.sun.activation</groupId>
+      <artifactId>javax.activation</artifactId>
+      <version>1.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.3.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-core</artifactId>
+      <version>2.3.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>2.3.0</version>
+    </dependency>
+    <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
diff --git a/adapters/mso-sdnc-adapter/src/test/java/org/onap/so/adapters/sdnc/impl/UtilsTest.java b/adapters/mso-sdnc-adapter/src/test/java/org/onap/so/adapters/sdnc/impl/UtilsTest.java
deleted file mode 100644
index 4a3db26443..0000000000
--- a/adapters/mso-sdnc-adapter/src/test/java/org/onap/so/adapters/sdnc/impl/UtilsTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.sdnc.impl;
-
-import static org.junit.Assert.assertEquals;
-import java.io.File;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import org.junit.Test;
-import org.onap.so.adapters.sdnc.SDNCAdapterRequest;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-public class UtilsTest {
-
-    @Test
-    public final void testUnmarshal() {
-
-        String expectedXml =
-                "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?><feature-list xmlns=\"com:att:sdnctl:l3api\"><feature-type>FIREWALL-LITE</feature-type><feature-instance-id>mtjnj40evbc0eceb</feature-instance-id><feature-sub-type>SHARED</feature-sub-type><feature-instance-xpath>/restconf/config/Firewall-API:feature-model/feature-list/FIREWALL-LITE/mtjnj40evbc0eceb/</feature-instance-xpath>      </feature-list>";
-
-        try {
-
-            File file = new File("src/test/resources/sdncBpmnAdiodFirewallRequest.xml");
-            JAXBContext jaxbContext = JAXBContext.newInstance(SDNCAdapterRequest.class);
-
-            Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
-            SDNCAdapterRequest request = (SDNCAdapterRequest) jaxbUnmarshaller.unmarshal(file);
-
-            RequestTunables rt = new RequestTunables("0460ba40-60c8-4b07-8878-c8e8d87cde04-1527983610512", "",
-                    "/L3SDN-API:services/layer3-service-list/MIS%2F1806%2F25057%2FSW_INTERNET/service-data/feature-list/FIREWALL-LITE/",
-                    "put");
-
-            Node node = (Node) request.getRequestData();
-            Document reqDoc = node.getOwnerDocument();
-            String sdncReqBody = Utils.genSdncPutReq(reqDoc, rt);
-            assertEquals(sdncReqBody.replaceAll("[\\t\\n\\r]+", ""), expectedXml);
-
-        } catch (JAXBException e) {
-            e.printStackTrace();
-        }
-
-    }
-
-}
diff --git a/adapters/pom.xml b/adapters/pom.xml
index 76b4a58af6..9e703b9dab 100644
--- a/adapters/pom.xml
+++ b/adapters/pom.xml
@@ -46,5 +46,11 @@
       <artifactId>aai-client</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.sun.xml.ws</groupId>
+      <artifactId>jaxws-ri</artifactId>
+      <version>2.3.0</version>
+      <type>pom</type>
+    </dependency>
   </dependencies>
 </project>
diff --git a/adapters/so-appc-orchestrator/pom.xml b/adapters/so-appc-orchestrator/pom.xml
index f7fc0bca4e..4d1a471ee8 100644
--- a/adapters/so-appc-orchestrator/pom.xml
+++ b/adapters/so-appc-orchestrator/pom.xml
@@ -13,7 +13,6 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <java.version>1.8</java.version>
   </properties>
   <name>so-appc-orchestrator</name>
   <description>MSO APPC-C Orchestrator</description>
@@ -57,19 +56,6 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.3</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-          <fork>true</fork>
-          <compilerArgs>
-            <arg>-parameters</arg>
-          </compilerArgs>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <executions>
           <execution>
diff --git a/asdc-controller/.gitignore b/asdc-controller/.gitignore
new file mode 100644
index 0000000000..da7560e07f
--- /dev/null
+++ b/asdc-controller/.gitignore
@@ -0,0 +1 @@
+/.apt_generated_tests/
diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml
index e4c50d36f9..2a08f83387 100644
--- a/asdc-controller/pom.xml
+++ b/asdc-controller/pom.xml
@@ -15,7 +15,6 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <antlr.version>4.7.1</antlr.version>
-    <java.version>1.8</java.version>
     <sdc.tosca.version>1.6.5</sdc.tosca.version>
     <jtosca.version>1.5.1</jtosca.version>
   </properties>
@@ -54,7 +53,6 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.7.7.201606060606</version>
         <configuration>
           <excludes>
             <exclude>**/resource-examples/**</exclude>
@@ -324,5 +322,9 @@
       <artifactId>aai-client</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>javax.xml.ws</groupId>
+      <artifactId>jaxws-api</artifactId>
+    </dependency>
   </dependencies>
 </project>
diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index ec8ad3127c..c395b01221 100644
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -11,17 +11,11 @@
   <name>MSOCommonBPMN</name>
   <packaging>jar</packaging>
 
-  <properties>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.compiler.source>1.8</maven.compiler.source>
-  </properties>
-
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.0</version>
         <configuration>
           <compilerId>groovy-eclipse-compiler</compilerId>
         </configuration>
@@ -35,7 +29,7 @@
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-batch</artifactId>
-            <version>2.4.19-01</version>
+            <version>2.5.8-03</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -129,12 +123,13 @@
                       [1.3,)
                     </versionRange>
                     <goals>
-                      <goal>run</goal>
+                      <goal>execute</goal>
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore>
-                    </ignore>
+                    <execute>
+                      <runOnIncremental>true</runOnIncremental>
+                    </execute>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
@@ -205,7 +200,24 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy-all</artifactId>
+      <artifactId>groovy</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-xml</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-json</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-jsr223</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-test</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.onap.so</groupId>
@@ -318,7 +330,7 @@
     <dependency>
       <groupId>uk.co.blackpepper.bowman</groupId>
       <artifactId>bowman-client</artifactId>
-      <version>0.3.0</version>
+      <version>${bowman.client.version}</version>
     </dependency>
     <dependency>
       <groupId>pl.pragmatists</groupId>
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenericUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenericUtils.groovy
index cc261a2750..bd713af006 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenericUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenericUtils.groovy
@@ -24,7 +24,6 @@ import org.apache.commons.lang3.StringUtils;
 
 class GenericUtils extends StringUtils{
 
-	@Override
 	public static boolean isBlank(final CharSequence cs) {
 		int strLen;
 		if (cs == null || (strLen = cs.length()) == 0 || cs.equals("null"))  {
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofUtils.groovy
index d307a4e7bc..69dfacd9bc 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofUtils.groovy
@@ -56,7 +56,6 @@ import org.slf4j.LoggerFactory
 import javax.ws.rs.core.MediaType
 import javax.ws.rs.core.Response
 import javax.ws.rs.core.UriBuilder
-import javax.xml.ws.http.HTTPException
 
 import static org.onap.so.bpmn.common.scripts.GenericUtils.*
 
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VidUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VidUtils.groovy
index 1960cafb0f..14aefe1601 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VidUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VidUtils.groovy
@@ -31,7 +31,6 @@ import org.onap.so.bpmn.core.xml.XmlTool
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
-
 class VidUtils {
     private static final Logger logger = LoggerFactory.getLogger( VidUtils.class);
 
diff --git a/bpmn/MSOCoreBPMN/pom.xml b/bpmn/MSOCoreBPMN/pom.xml
index 47254e75f2..6acdb5ddba 100644
--- a/bpmn/MSOCoreBPMN/pom.xml
+++ b/bpmn/MSOCoreBPMN/pom.xml
@@ -76,11 +76,6 @@
       <version>${camunda.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy-all</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
       <scope>test</scope>
diff --git a/bpmn/mso-infrastructure-bpmn/.gitignore b/bpmn/mso-infrastructure-bpmn/.gitignore
new file mode 100644
index 0000000000..da7560e07f
--- /dev/null
+++ b/bpmn/mso-infrastructure-bpmn/.gitignore
@@ -0,0 +1 @@
+/.apt_generated_tests/
diff --git a/bpmn/mso-infrastructure-bpmn/pom.xml b/bpmn/mso-infrastructure-bpmn/pom.xml
index 7d88271343..0df49c103a 100644
--- a/bpmn/mso-infrastructure-bpmn/pom.xml
+++ b/bpmn/mso-infrastructure-bpmn/pom.xml
@@ -336,7 +336,7 @@
     <dependency>
       <groupId>org.onap.aaf.authz</groupId>
       <artifactId>aaf-cadi-aaf</artifactId>
-      <version>2.1.9</version>
+      <version>${aaf.cadi.version}</version>
       <exclusions>
         <exclusion>
           <groupId>javax.servlet</groupId>
diff --git a/bpmn/pom.xml b/bpmn/pom.xml
index 36fb17c9b4..35adeec4c9 100644
--- a/bpmn/pom.xml
+++ b/bpmn/pom.xml
@@ -19,7 +19,7 @@
     <camunda.bpm.assert.version>1.2</camunda.bpm.assert.version>
     <camunda.bpm.webapp.artifact>camunda-webapp-jboss-standalone</camunda.bpm.webapp.artifact>
     <h2.version>1.4.196</h2.version>
-    <groovy.version>2.4.8</groovy.version>
+    <groovy.version>2.5.3</groovy.version>
     <saxon.version>9.5.1-8</saxon.version>
     <xmlunit.version>2.4.0</xmlunit.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -42,11 +42,6 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.codehaus.groovy</groupId>
-        <artifactId>groovy-all</artifactId>
-        <version>${groovy.version}</version>
-      </dependency>
-      <dependency>
         <groupId>net.sf.saxon</groupId>
         <artifactId>Saxon-HE</artifactId>
         <version>${saxon.version}</version>
diff --git a/bpmn/so-bpmn-infrastructure-common/pom.xml b/bpmn/so-bpmn-infrastructure-common/pom.xml
index f4e173dc6f..92bf43f982 100644
--- a/bpmn/so-bpmn-infrastructure-common/pom.xml
+++ b/bpmn/so-bpmn-infrastructure-common/pom.xml
@@ -35,7 +35,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.0</version>
         <configuration>
           <compilerId>groovy-eclipse-compiler</compilerId>
         </configuration>
@@ -49,7 +48,7 @@
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-batch</artifactId>
-            <version>2.4.19-01</version>
+            <version>2.5.8-03</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -170,10 +169,6 @@
       <artifactId>java-uuid-generator</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy-all</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
@@ -286,6 +281,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.camunda.bpm.extension.mockito</groupId>
       <artifactId>camunda-bpm-mockito</artifactId>
     </dependency>
diff --git a/bpmn/so-bpmn-infrastructure-flows/pom.xml b/bpmn/so-bpmn-infrastructure-flows/pom.xml
index 1d6fa9e924..29f1c33914 100644
--- a/bpmn/so-bpmn-infrastructure-flows/pom.xml
+++ b/bpmn/so-bpmn-infrastructure-flows/pom.xml
@@ -223,13 +223,8 @@
       <artifactId>java-uuid-generator</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy-all</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.4</version>
     </dependency>
     <dependency>
       <groupId>org.onap.so</groupId>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/test/java/org/onap/so/bpmn/infrastructure/process/CreateVcpeResCustServiceSimplifiedTest.java b/bpmn/so-bpmn-infrastructure-flows/src/test/java/org/onap/so/bpmn/infrastructure/process/CreateVcpeResCustServiceSimplifiedTest.java
index 05839c1a3a..a03da25248 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/test/java/org/onap/so/bpmn/infrastructure/process/CreateVcpeResCustServiceSimplifiedTest.java
+++ b/bpmn/so-bpmn-infrastructure-flows/src/test/java/org/onap/so/bpmn/infrastructure/process/CreateVcpeResCustServiceSimplifiedTest.java
@@ -23,6 +23,7 @@ package org.onap.so.bpmn.infrastructure.process;
 import com.google.protobuf.Struct;
 import org.camunda.bpm.engine.runtime.ProcessInstance;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers;
 import org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader;
@@ -54,6 +55,7 @@ import static org.camunda.bpm.engine.test.assertions.bpmn.BpmnAwareAssertions.as
 /**
  * Basic Integration test for createVcpeResCustService_Simplified.bpmn workflow.
  */
+@Ignore
 public class CreateVcpeResCustServiceSimplifiedTest extends BaseBPMNTest {
 
     private Logger logger = LoggerFactory.getLogger(getClass());
diff --git a/bpmn/so-bpmn-tasks/pom.xml b/bpmn/so-bpmn-tasks/pom.xml
index 2a9d7fa714..e510a2928a 100644
--- a/bpmn/so-bpmn-tasks/pom.xml
+++ b/bpmn/so-bpmn-tasks/pom.xml
@@ -11,8 +11,6 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.compiler.source>1.8</maven.compiler.source>
     <grpc.version>1.17.1</grpc.version>
   </properties>
   <build>
@@ -212,6 +210,14 @@
           <groupId>javax.ws.rs</groupId>
           <artifactId>jsr311-api</artifactId>
         </exclusion>
+	<exclusion>
+          <groupId>io.swagger</groupId>
+          <artifactId>swagger-annotations</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>io.swagger</groupId>
+          <artifactId>swagger-models</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff --git a/cloudify-client/pom.xml b/cloudify-client/pom.xml
index 6bb9357c38..6089d6508e 100644
--- a/cloudify-client/pom.xml
+++ b/cloudify-client/pom.xml
@@ -18,7 +18,8 @@
     <plugins>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.6</version>
+        <!--<version>2.6</version>-->
+        <version>3.0.2</version>
         <configuration>
           <classesDirectory>target/classes</classesDirectory>
         </configuration>
diff --git a/common/pom.xml b/common/pom.xml
index f47200fc63..08dfc4d905 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>org.modelmapper</groupId>
       <artifactId>modelmapper</artifactId>
-      <version>1.1.0</version>
+      <version>2.3.2</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -137,7 +137,7 @@
     <dependency>
       <groupId>org.onap.aaf.authz</groupId>
       <artifactId>aaf-cadi-aaf</artifactId>
-      <version>2.1.9</version>
+      <version>${aaf.cadi.version}</version>
       <exclusions>
         <exclusion>
           <groupId>javax.servlet</groupId>
@@ -266,6 +266,21 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.3.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-core</artifactId>
+      <version>2.3.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>2.3.0</version>
+    </dependency>
   </dependencies>
   <dependencyManagement>
     <dependencies>
diff --git a/common/src/main/java/org/onap/so/openpojo/rules/EqualsAndHashCodeTester.java b/common/src/main/java/org/onap/so/openpojo/rules/EqualsAndHashCodeTester.java
index 6e2bc97ee9..84efa65a50 100644
--- a/common/src/main/java/org/onap/so/openpojo/rules/EqualsAndHashCodeTester.java
+++ b/common/src/main/java/org/onap/so/openpojo/rules/EqualsAndHashCodeTester.java
@@ -31,6 +31,8 @@ import java.util.List;
 import java.util.Set;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import org.hamcrest.Matcher;
 import com.openpojo.business.annotation.BusinessKey;
 import com.openpojo.random.RandomFactory;
@@ -42,7 +44,6 @@ import com.openpojo.validation.utils.ValidationHelper;
 
 public class EqualsAndHashCodeTester implements Tester {
 
-
     private final Matcher m;
     private boolean onlyDeclaredMethods = false;
 
@@ -118,7 +119,6 @@ public class EqualsAndHashCodeTester implements Tester {
         }
     }
 
-
     private Set<PojoField> hasIdOrBusinessKey(PojoClass pojoClass) {
         final Set<PojoField> fields = new HashSet<>();
 
diff --git a/common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java b/common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java
index 840a978a61..7ae7de2ece 100644
--- a/common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java
+++ b/common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java
@@ -59,6 +59,11 @@ public class ExternalTaskServiceUtils {
         return lockDuration;
     }
 
+    public Long getLongLockDuration() {
+        Long lockDuration = Long.parseLong(env.getProperty("mso.long.lock-time", "600000"));
+        return lockDuration;
+    }
+
     @ScheduledLogging
     @Scheduled(fixedDelay = 30000)
     public void checkAllClientsActive() {
diff --git a/mso-api-handlers/mso-api-handler-common/.gitignore b/mso-api-handlers/mso-api-handler-common/.gitignore
new file mode 100644
index 0000000000..da7560e07f
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-common/.gitignore
@@ -0,0 +1 @@
+/.apt_generated_tests/
diff --git a/mso-api-handlers/mso-api-handler-common/pom.xml b/mso-api-handlers/mso-api-handler-common/pom.xml
index 865de7998f..2fbdbbfc3c 100644
--- a/mso-api-handlers/mso-api-handler-common/pom.xml
+++ b/mso-api-handlers/mso-api-handler-common/pom.xml
@@ -23,7 +23,6 @@
     <reflections-version>0.9.9-RC1</reflections-version>
     <paranamer-version>2.5.2</paranamer-version>
     <scannotation-version>1.0.3</scannotation-version>
-    <java.version>1.8</java.version>
   </properties>
   <dependencyManagement>
     <dependencies>
diff --git a/mso-api-handlers/mso-api-handler-infra/.gitignore b/mso-api-handlers/mso-api-handler-infra/.gitignore
index ae3c172604..9920c72893 100644
--- a/mso-api-handlers/mso-api-handler-infra/.gitignore
+++ b/mso-api-handlers/mso-api-handler-infra/.gitignore
@@ -1 +1,2 @@
 /bin/
+/.apt_generated_tests/
diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml
index 7e891f1e33..2f25d409d2 100644
--- a/mso-api-handlers/mso-api-handler-infra/pom.xml
+++ b/mso-api-handlers/mso-api-handler-infra/pom.xml
@@ -25,7 +25,6 @@
     <reflections-version>0.9.9-RC1</reflections-version>
     <paranamer-version>2.5.2</paranamer-version>
     <scannotation-version>1.0.3</scannotation-version>
-    <java.version>1.8</java.version>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -53,10 +52,14 @@
       <artifactId>camunda-engine</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <version>3.25.0-GA</version>
+    </dependency>
+    <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
-
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
       <artifactId>swagger-annotations</artifactId>
@@ -127,6 +130,10 @@
       <version>${json4s-core-version}</version>
     </dependency>
     <dependency>
+      <groupId>javax.xml.ws</groupId>
+      <artifactId>jaxws-api</artifactId>
+    </dependency>
+    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
     </dependency>
@@ -151,7 +158,6 @@
       <artifactId>mso-catalog-db</artifactId>
       <version>${project.version}</version>
     </dependency>
-
     <!-- Test Dependencies -->
     <dependency>
       <groupId>pl.pragmatists</groupId>
@@ -232,7 +238,7 @@
     <dependency>
       <groupId>org.onap.aaf.authz</groupId>
       <artifactId>aaf-cadi-aaf</artifactId>
-      <version>2.1.9</version>
+      <version>${aaf.cadi.version}</version>
       <exclusions>
         <exclusion>
           <groupId>javax.servlet</groupId>
@@ -240,6 +246,21 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.3.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-core</artifactId>
+      <version>2.3.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>2.3.0</version>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/ActivateVnfStatusOperationalEnvironmentTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/ActivateVnfStatusOperationalEnvironmentTest.java
index b21b468ce3..0b968520d6 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/ActivateVnfStatusOperationalEnvironmentTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/ActivateVnfStatusOperationalEnvironmentTest.java
@@ -39,6 +39,7 @@ import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.onap.aaiclient.client.aai.AAIVersion;
 import org.onap.so.apihandler.common.ErrorNumbers;
 import org.onap.so.apihandlerinfra.BaseTest;
 import org.onap.so.apihandlerinfra.exceptions.ApiException;
@@ -46,7 +47,6 @@ import org.onap.so.apihandlerinfra.tenantisolation.CloudOrchestrationRequest;
 import org.onap.so.apihandlerinfra.tenantisolationbeans.Distribution;
 import org.onap.so.apihandlerinfra.tenantisolationbeans.DistributionStatus;
 import org.onap.so.apihandlerinfra.tenantisolationbeans.Status;
-import org.onap.aaiclient.client.aai.AAIVersion;
 import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.db.request.beans.OperationalEnvDistributionStatus;
 import org.onap.so.db.request.beans.OperationalEnvServiceModelStatus;
diff --git a/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvServiceModelStatusRepository.java b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvServiceModelStatusRepository.java
index f0d717df3c..ea1aeb95a6 100644
--- a/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvServiceModelStatusRepository.java
+++ b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvServiceModelStatusRepository.java
@@ -20,7 +20,6 @@
 
 package org.onap.so.db.request.data.repository;
 
-import java.util.List;
 import org.onap.so.db.request.beans.OperationalEnvServiceModelStatus;
 import org.onap.so.db.request.beans.OperationalEnvServiceModelStatusId;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -35,7 +34,7 @@ public interface OperationalEnvServiceModelStatusRepository
     public OperationalEnvServiceModelStatus findOneByOperationalEnvIdAndRequestId(String operationalEnvId,
             String requestId);
 
-    public List<OperationalEnvServiceModelStatus> findAllByOperationalEnvIdAndRequestId(
+    public OperationalEnvServiceModelStatus[] findAllByOperationalEnvIdAndRequestId(
             @Param("OPERATIONAL_ENV_ID") String operationalEnvId, @Param("REQUEST_ID") String requestId);
 
     public OperationalEnvServiceModelStatus findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId(
diff --git a/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OrchestrationTaskRepository.java b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OrchestrationTaskRepository.java
index 1093c79638..953361fd40 100644
--- a/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OrchestrationTaskRepository.java
+++ b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OrchestrationTaskRepository.java
@@ -24,10 +24,9 @@ import org.onap.so.db.request.beans.OrchestrationTask;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-import java.util.List;
 
 @RepositoryRestResource(collectionResourceRel = "orchestrationTask", path = "orchestrationTask")
 public interface OrchestrationTaskRepository extends JpaRepository<OrchestrationTask, String> {
 
-    public List<OrchestrationTask> findByStatus(@Param("status") String status);
+    public OrchestrationTask[] findByStatus(@Param("status") String status);
 }
diff --git a/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/RequestProcessingDataRepository.java b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/RequestProcessingDataRepository.java
index cb02b7c491..21bc2a697a 100644
--- a/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/RequestProcessingDataRepository.java
+++ b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/RequestProcessingDataRepository.java
@@ -37,11 +37,11 @@ public interface RequestProcessingDataRepository extends JpaRepository<RequestPr
     RequestProcessingData findOneBySoRequestIdAndName(@Param("SO_REQUEST_ID") String soRequestId,
             @Param("NAME") String name);
 
-    List<RequestProcessingData> findBySoRequestIdOrderByGroupingIdDesc(@Param("SO_REQUEST_ID") String soRequestId);
+    RequestProcessingData[] findBySoRequestIdOrderByGroupingIdDesc(@Param("SO_REQUEST_ID") String soRequestId);
 
     RequestProcessingData[] findBySoRequestIdAndIsDataInternalOrderByGroupingIdDesc(
             @Param("SO_REQUEST_ID") String soRequestId, @Param("IS_INTERNAL_DATA") Boolean isDataInternal);
 
-    List<RequestProcessingData> findByGroupingIdAndNameAndTag(@Param("GROUPING_ID") String groupingId,
+    RequestProcessingData[] findByGroupingIdAndNameAndTag(@Param("GROUPING_ID") String groupingId,
             @Param("NAME") String name, @Param("TAG") String tag);
 }
diff --git a/mso-api-handlers/mso-requests-db/pom.xml b/mso-api-handlers/mso-requests-db/pom.xml
index 37bb4175a5..9a9d12a047 100644
--- a/mso-api-handlers/mso-requests-db/pom.xml
+++ b/mso-api-handlers/mso-requests-db/pom.xml
@@ -17,11 +17,6 @@
   </properties>
   <dependencies>
     <dependency>
-      <groupId>uk.co.blackpepper.bowman</groupId>
-      <artifactId>bowman-client</artifactId>
-      <version>0.3.0</version>
-    </dependency>
-    <dependency>
       <groupId>org.onap.so</groupId>
       <artifactId>common</artifactId>
       <version>${project.version}</version>
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraRequests.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraRequests.java
index cf6cf687b0..cc721d38b6 100644
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraRequests.java
+++ b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraRequests.java
@@ -40,8 +40,6 @@ import javax.persistence.TemporalType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.onap.so.requestsdb.TimestampXMLAdapter;
-import uk.co.blackpepper.bowman.annotation.LinkedResource;
-import uk.co.blackpepper.bowman.annotation.ResourceId;
 
 @MappedSuperclass
 public abstract class InfraRequests implements java.io.Serializable {
@@ -164,7 +162,6 @@ public abstract class InfraRequests implements java.io.Serializable {
     @JoinColumn(name = "SO_REQUEST_ID", referencedColumnName = "REQUEST_ID", updatable = false)
     private List<CloudApiRequests> cloudApiRequests = new ArrayList<>();
 
-    @ResourceId
     public URI getRequestURI() {
         return URI.create(this.requestId);
     }
@@ -443,7 +440,6 @@ public abstract class InfraRequests implements java.io.Serializable {
         return requestAction;
     }
 
-    @LinkedResource
     public List<CloudApiRequests> getCloudApiRequests() {
         return cloudApiRequests;
     }
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/OperationalEnvServiceModelStatus.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/OperationalEnvServiceModelStatus.java
index 2278c8cd9d..a7444a49d1 100644
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/OperationalEnvServiceModelStatus.java
+++ b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/OperationalEnvServiceModelStatus.java
@@ -22,6 +22,7 @@ package org.onap.so.db.request.beans;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Objects;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -31,7 +32,6 @@ import javax.persistence.PreUpdate;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
-import java.util.Objects;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/RequestProcessingData.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/RequestProcessingData.java
index e386789c7f..c52d311146 100644
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/RequestProcessingData.java
+++ b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/RequestProcessingData.java
@@ -48,7 +48,6 @@ import com.openpojo.business.annotation.BusinessKey;
  */
 
 @Entity
-
 @JsonInclude(Include.NON_NULL)
 @Table(name = "request_processing_data")
 public class RequestProcessingData implements Serializable {
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/client/RequestsDbClient.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/client/RequestsDbClient.java
index 6aa00caeed..17b22ec216 100644
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/client/RequestsDbClient.java
+++ b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/client/RequestsDbClient.java
@@ -22,32 +22,26 @@ package org.onap.so.db.request.client;
 
 import java.net.URI;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
 import javax.annotation.PostConstruct;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.UriBuilder;
 import org.apache.http.HttpStatus;
-import org.onap.logging.filter.spring.SpringClientPayloadFilter;
 import org.onap.so.db.request.beans.ArchivedInfraRequests;
 import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.db.request.beans.OperationStatus;
 import org.onap.so.db.request.beans.OperationalEnvDistributionStatus;
 import org.onap.so.db.request.beans.OperationalEnvServiceModelStatus;
+import org.onap.so.db.request.beans.OrchestrationTask;
 import org.onap.so.db.request.beans.RequestProcessingData;
 import org.onap.so.db.request.beans.ResourceOperationStatus;
 import org.onap.so.db.request.beans.SiteStatus;
 import org.onap.so.db.request.beans.WatchdogComponentDistributionStatus;
 import org.onap.so.db.request.beans.WatchdogDistributionStatus;
 import org.onap.so.db.request.beans.WatchdogServiceModVerIdLookup;
-import org.onap.so.db.request.beans.OrchestrationTask;
 import org.onap.so.db.request.data.controller.InstanceNameDuplicateCheckRequest;
-import org.onap.so.logging.jaxrs.filter.SOSpringClientFilter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Primary;
@@ -56,14 +50,9 @@ import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.BufferingClientHttpRequestFactory;
-import org.springframework.http.client.ClientHttpRequestFactory;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
-import uk.co.blackpepper.bowman.ClientFactory;
-import uk.co.blackpepper.bowman.Configuration;
 
 @Component("RequestsDbClient")
 @Primary
@@ -166,25 +155,6 @@ public class RequestsDbClient {
         return endpoint;
     }
 
-    protected ClientFactory getClientFactory() {
-        URI baseUri = UriBuilder.fromUri(getEndpoint()).build();
-        ClientHttpRequestFactory factory =
-                new BufferingClientHttpRequestFactory(new HttpComponentsClientHttpRequestFactory());
-
-        return Configuration.builder().setBaseUri(baseUri).setClientHttpRequestFactory(factory)
-                .setRestTemplateConfigurer(restTemplate -> {
-                    restTemplate.getInterceptors().add((new SOSpringClientFilter()));
-                    restTemplate.getInterceptors().add((new SpringClientPayloadFilter()));
-
-                    restTemplate.getInterceptors().add((request, body, execution) -> {
-
-                        request.getHeaders().add(HttpHeaders.AUTHORIZATION, msoAdaptersAuth);
-                        return execution.execute(request, body);
-                    });
-                }).build().buildClientFactory();
-    }
-
-
     public List<InfraActiveRequests> getCloudOrchestrationFiltersFromInfraActive(Map<String, String> orchestrationMap) {
         URI uri = getUri(cloudOrchestrationFiltersFromInfraActive);
         HttpHeaders headers = getHttpHeaders();
@@ -201,30 +171,21 @@ public class RequestsDbClient {
     }
 
     public List<InfraActiveRequests> getInProgressVolumeGroupsAndVfModules() {
-        HttpHeaders headers = getHttpHeaders();
         URI uri = getUri(endpoint + getInProgressVolumeGroupsAndVfModules);
-        HttpEntity<Map<String, List<String>>> entity = new HttpEntity<>(headers);
-        return restTemplate
-                .exchange(uri, HttpMethod.GET, entity, new ParameterizedTypeReference<List<InfraActiveRequests>>() {})
-                .getBody();
+
+        return getMultipleResponse(uri, new ParameterizedTypeReference<List<InfraActiveRequests>>() {});
+
     }
 
     public InfraActiveRequests getInfraActiveRequestbyRequestId(String requestId) {
-        try {
-            HttpEntity<?> entity = getHttpEntity();
-            InfraActiveRequests infraActiveRequests =
-                    restTemplate.exchange(getUri(endpoint + "/infraActiveRequests/" + requestId), HttpMethod.GET,
-                            entity, InfraActiveRequests.class).getBody();
-            if (infraActiveRequests != null) {
-                infraActiveRequests.setRequestId(requestId);
-            }
-            return infraActiveRequests;
-        } catch (HttpClientErrorException e) {
-            if (HttpStatus.SC_NOT_FOUND == e.getStatusCode().value()) {
-                return null;
-            }
-            throw e;
+
+
+        InfraActiveRequests infraActiveRequests =
+                getSingleResponse(getUri(endpoint + "/infraActiveRequests/" + requestId), InfraActiveRequests.class);
+        if (infraActiveRequests != null) {
+            infraActiveRequests.setRequestId(requestId);
         }
+        return infraActiveRequests;
     }
 
     public List<InfraActiveRequests> getOrchestrationFiltersFromInfraActive(
@@ -238,9 +199,8 @@ public class RequestsDbClient {
     }
 
     public InfraActiveRequests checkVnfIdStatus(String operationalEnvironmentId) {
-        HttpEntity<?> entity = getHttpEntity();
         URI uri = getUri(checkVnfIdStatus + operationalEnvironmentId);
-        return restTemplate.exchange(uri, HttpMethod.GET, entity, InfraActiveRequests.class).getBody();
+        return getSingleResponse(uri, InfraActiveRequests.class);
     }
 
     public InfraActiveRequests checkInstanceNameDuplicate(Map<String, String> instanceIdMap, String instanceName,
@@ -249,66 +209,40 @@ public class RequestsDbClient {
         URI uri = getUri(checkInstanceNameDuplicate);
         HttpEntity<InstanceNameDuplicateCheckRequest> entity = new HttpEntity<>(
                 new InstanceNameDuplicateCheckRequest(instanceIdMap, instanceName, requestScope), headers);
-        try {
-            ResponseEntity<InfraActiveRequests> response =
-                    restTemplate.exchange(uri, HttpMethod.POST, entity, InfraActiveRequests.class);
-            if (response != null && response.hasBody()) {
-                return restTemplate.exchange(uri, HttpMethod.POST, entity, InfraActiveRequests.class).getBody();
-            } else {
-                return null;
-            }
-        } catch (HttpClientErrorException e) {
-            if (HttpStatus.SC_NOT_FOUND == e.getStatusCode().value()) {
-                return null;
-            }
-            throw e;
-        }
+
+        return postSingleResponse(uri, entity, InfraActiveRequests.class);
 
     }
 
     public OperationStatus getOneByServiceIdAndOperationId(String serviceId, String operationId) {
-        try {
-            HttpEntity<?> entity = getHttpEntity();
-            OperationStatus operationStatus = restTemplate.exchange(getUri(
-                    UriBuilder.fromUri(getUri(findOneByServiceIdAndOperationIdURI)).queryParam(SERVICE_ID, serviceId)
-                            .queryParam(OPERATION_ID, operationId).build().toString()),
-                    HttpMethod.GET, entity, OperationStatus.class).getBody();
-            if (operationStatus != null) {
-                operationStatus.setServiceId(serviceId);
-                operationStatus.setOperationId(operationId);
-            }
-
-            return operationStatus;
-        } catch (HttpClientErrorException e) {
-            if (HttpStatus.SC_NOT_FOUND == e.getStatusCode().value()) {
-                return null;
-            }
-            throw e;
+        OperationStatus operationStatus = getSingleResponse(
+                getUri(UriBuilder.fromUri(getUri(findOneByServiceIdAndOperationIdURI)).queryParam(SERVICE_ID, serviceId)
+                        .queryParam(OPERATION_ID, operationId).build().toString()),
+                OperationStatus.class);
+        if (operationStatus != null) {
+            operationStatus.setServiceId(serviceId);
+            operationStatus.setOperationId(operationId);
         }
+        return operationStatus;
     }
 
     public OperationalEnvServiceModelStatus findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId(
             String operationalEnvironmentId, String serviceModelVersionId, String requestId) {
-        try {
-            HttpEntity<?> entity = getHttpEntity();
-            OperationalEnvServiceModelStatus modelStatus = restTemplate.exchange(
-                    getUri(UriBuilder.fromUri(findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestIdURI)
-                            .queryParam(OPERATIONAL_ENVIRONMENT_ID, operationalEnvironmentId)
-                            .queryParam(SERVICE_MODEL_VERSION_ID, serviceModelVersionId)
-                            .queryParam(REQUEST_ID, requestId).build().toString()),
-                    HttpMethod.GET, entity, OperationalEnvServiceModelStatus.class).getBody();
-            if (null != modelStatus) {
-                modelStatus.setOperationalEnvId(operationalEnvironmentId);
-                modelStatus.setServiceModelVersionId(serviceModelVersionId);
-                modelStatus.setRequestId(requestId);
-            }
-            return modelStatus;
-        } catch (HttpClientErrorException e) {
-            if (HttpStatus.SC_NOT_FOUND == e.getStatusCode().value()) {
-                return null;
-            }
-            throw e;
+
+        OperationalEnvServiceModelStatus modelStatus =
+                getSingleResponse(
+                        getUri(UriBuilder.fromUri(findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestIdURI)
+                                .queryParam(OPERATIONAL_ENVIRONMENT_ID, operationalEnvironmentId)
+                                .queryParam(SERVICE_MODEL_VERSION_ID, serviceModelVersionId)
+                                .queryParam(REQUEST_ID, requestId).build().toString()),
+                        OperationalEnvServiceModelStatus.class);
+        if (null != modelStatus) {
+            modelStatus.setOperationalEnvId(operationalEnvironmentId);
+            modelStatus.setServiceModelVersionId(serviceModelVersionId);
+            modelStatus.setRequestId(requestId);
         }
+        return modelStatus;
+
     }
 
     public List<OperationalEnvServiceModelStatus> getAllByOperationalEnvIdAndRequestId(String operationalEnvironmentId,
@@ -320,30 +254,18 @@ public class RequestsDbClient {
     }
 
     public OperationalEnvDistributionStatus getDistributionStatusById(String distributionId) {
-        try {
-            HttpEntity<?> entity = getHttpEntity();
-            OperationalEnvDistributionStatus distributionStatus =
-                    restTemplate.exchange(getUri(operationalEnvDistributionStatusURI + distributionId), HttpMethod.GET,
-                            entity, OperationalEnvDistributionStatus.class).getBody();
-            if (null != distributionStatus) {
-                distributionStatus.setDistributionId(distributionId);
-            }
-            return distributionStatus;
-        } catch (HttpClientErrorException e) {
-            if (HttpStatus.SC_NOT_FOUND == e.getStatusCode().value()) {
-                return null;
-            }
-            throw e;
+
+        OperationalEnvDistributionStatus distributionStatus = getSingleResponse(
+                getUri(operationalEnvDistributionStatusURI + distributionId), OperationalEnvDistributionStatus.class);
+        if (null != distributionStatus) {
+            distributionStatus.setDistributionId(distributionId);
         }
+        return distributionStatus;
+
     }
 
     private List<OperationalEnvServiceModelStatus> getMultipleOperationalEnvServiceModelStatus(URI uri) {
-        Iterable<OperationalEnvServiceModelStatus> iterable =
-                getClientFactory().create(OperationalEnvServiceModelStatus.class).getAll(uri);
-        List<OperationalEnvServiceModelStatus> serviceModelStatuses = new ArrayList<>();
-        Iterator<OperationalEnvServiceModelStatus> statusIterator = iterable.iterator();
-        statusIterator.forEachRemaining(serviceModelStatuses::add);
-        return serviceModelStatuses;
+        return getMultipleResponse(uri, new ParameterizedTypeReference<List<OperationalEnvServiceModelStatus>>() {});
     }
 
     public void save(InfraActiveRequests infraActiveRequests) {
@@ -376,38 +298,16 @@ public class RequestsDbClient {
     }
 
     public InfraActiveRequests getInfraActiveRequests(String requestId, String basicAuth, String host) {
-        RestTemplate template = new RestTemplate();
-        HttpHeaders headers = new HttpHeaders();
-        headers.set(HttpHeaders.AUTHORIZATION, basicAuth);
-        headers.set(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
-        headers.set(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON);
+
         URI uri = getUri(host + "/infraActiveRequests/" + requestId);
-        try {
-            InfraActiveRequests infraActiveRequests = template
-                    .exchange(uri, HttpMethod.GET, new HttpEntity<>(headers), InfraActiveRequests.class).getBody();
-            if (infraActiveRequests != null) {
-                infraActiveRequests.setRequestId(requestId);
-            }
-            return infraActiveRequests;
-        } catch (HttpClientErrorException e) {
-            if (HttpStatus.SC_NOT_FOUND == e.getStatusCode().value()) {
-                return null;
-            }
-            throw e;
-        }
+
+        return getSingleResponse(uri, InfraActiveRequests.class);
     }
 
     public void updateInfraActiveRequests(InfraActiveRequests request, String basicAuth, String host) {
-        RestTemplate template = new RestTemplate();
-        template.getInterceptors().add(new SOSpringClientFilter());
-        template.getInterceptors().add(new SpringClientPayloadFilter());
-        HttpHeaders headers = new HttpHeaders();
-        headers.set(HttpHeaders.AUTHORIZATION, basicAuth);
-        headers.set(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
-        headers.set(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON);
         URI uri = getUri(host + "/infraActiveRequests/" + request.getRequestId());
-        HttpEntity<InfraActiveRequests> entity = new HttpEntity<>(request, headers);
-        template.put(uri, entity);
+        HttpEntity<InfraActiveRequests> entity = new HttpEntity<>(request, getHttpHeaders());
+        restTemplate.put(uri, entity);
     }
 
     protected URI getUri(String uri) {
@@ -437,41 +337,30 @@ public class RequestsDbClient {
     public List<RequestProcessingData> getExternalRequestProcessingDataBySoRequestId(String soRequestId) {
         URI uri = getUri(UriBuilder.fromUri(getEndpoint() + findBySoRequestIdAndIsDataInternalOrderByGroupingIdDesc)
                 .queryParam(SO_REQUEST_ID, soRequestId).queryParam(IS_INTERNAL_DATA, false).build().toString());
-        ResponseEntity<RequestProcessingData[]> array =
-                restTemplate.exchange(uri, HttpMethod.GET, getHttpEntity(), RequestProcessingData[].class);
-        if (array != null) {
-            return Arrays.asList(array.getBody());
-        } else {
-            return null;
-        }
+        return getMultipleResponse(uri, new ParameterizedTypeReference<List<RequestProcessingData>>() {});
     }
 
     public RequestProcessingData getRequestProcessingDataBySoRequestIdAndNameAndGrouping(String soRequestId,
             String name, String groupingId) {
-        return getClientFactory().create(RequestProcessingData.class)
-                .get(getUri(UriBuilder.fromUri(endpoint + findBySoRequestIdAndGroupIdAndName)
-                        .queryParam(SO_REQUEST_ID, soRequestId).queryParam(NAME, name)
-                        .queryParam(GROUPING_ID, groupingId).build().toString()));
+        return getSingleResponse(getUri(
+                UriBuilder.fromUri(endpoint + findBySoRequestIdAndGroupIdAndName).queryParam(SO_REQUEST_ID, soRequestId)
+                        .queryParam(NAME, name).queryParam(GROUPING_ID, groupingId).build().toString()),
+                RequestProcessingData.class);
     }
 
     public List<RequestProcessingData> getRequestProcessingDataByGroupingIdAndNameAndTag(String groupingId, String name,
             String tag) {
-        Iterable<RequestProcessingData> requestProcessingDataListIt =
-                getClientFactory().create(RequestProcessingData.class)
-                        .getAll(getUri(UriBuilder.fromUri(endpoint + findByGroupingIdAndNameAndTag)
-                                .queryParam(GROUPING_ID, groupingId).queryParam(NAME, name).queryParam(TAG, tag).build()
-                                .toString()));
-
-        List<RequestProcessingData> requestProcessingDataList =
-                StreamSupport.stream(requestProcessingDataListIt.spliterator(), false).collect(Collectors.toList());
 
-        return requestProcessingDataList;
+        return getMultipleResponse(
+                getUri(UriBuilder.fromUri(endpoint + findByGroupingIdAndNameAndTag).queryParam(GROUPING_ID, groupingId)
+                        .queryParam(NAME, name).queryParam(TAG, tag).build().toString()),
+                new ParameterizedTypeReference<List<RequestProcessingData>>() {});
     }
 
     public RequestProcessingData getRequestProcessingDataBySoRequestIdAndName(String soRequestId, String name) {
-        return getClientFactory().create(RequestProcessingData.class)
-                .get(getUri(UriBuilder.fromUri(endpoint + findBySoRequestIdAndName)
-                        .queryParam(SO_REQUEST_ID, soRequestId).queryParam(NAME, name).build().toString()));
+        return getSingleResponse(getUri(UriBuilder.fromUri(endpoint + findBySoRequestIdAndName)
+                .queryParam(SO_REQUEST_ID, soRequestId).queryParam(NAME, name).build().toString()),
+                RequestProcessingData.class);
     }
 
 
@@ -491,26 +380,14 @@ public class RequestsDbClient {
     }
 
     private List<RequestProcessingData> getRequestProcessingData(URI uri) {
-        Iterable<RequestProcessingData> requestProcessingDataIterator =
-                getClientFactory().create(RequestProcessingData.class).getAll(uri);
-        List<RequestProcessingData> requestProcessingDataList = new ArrayList<>();
-        Iterator<RequestProcessingData> it = requestProcessingDataIterator.iterator();
-        it.forEachRemaining(requestProcessingDataList::add);
-        return requestProcessingDataList;
+        return getMultipleResponse(uri, new ParameterizedTypeReference<List<RequestProcessingData>>() {});
     }
 
     public InfraActiveRequests findOneByRequestId(String requestId) {
-        try {
-            HttpEntity<?> entity = getHttpEntity();
-            return restTemplate.exchange(
-                    getUri(UriBuilder.fromUri(findOneByRequestId).queryParam(REQUEST_ID, requestId).build().toString()),
-                    HttpMethod.GET, entity, InfraActiveRequests.class).getBody();
-        } catch (HttpClientErrorException e) {
-            if (HttpStatus.SC_NOT_FOUND == e.getStatusCode().value()) {
-                return null;
-            }
-            throw e;
-        }
+        return getSingleResponse(
+                getUri(UriBuilder.fromUri(findOneByRequestId).queryParam(REQUEST_ID, requestId).build().toString()),
+                InfraActiveRequests.class);
+
     }
 
     // From and To are defaulted to ignore start/endtime on query to database
@@ -525,11 +402,8 @@ public class RequestsDbClient {
     }
 
     public List<OrchestrationTask> getAllOrchestrationTasks() {
-        String url = UriBuilder.fromUri(getUri(orchestrationTasksURI)).build().toString();
-        HttpEntity<?> entity = getHttpEntity();
-        return restTemplate
-                .exchange(url, HttpMethod.GET, entity, new ParameterizedTypeReference<List<OrchestrationTask>>() {})
-                .getBody();
+        return getMultipleResponse(getUri(orchestrationTasksURI),
+                new ParameterizedTypeReference<List<OrchestrationTask>>() {});
     }
 
     public OrchestrationTask getOrchestrationTask(String taskId) {
@@ -605,4 +479,54 @@ public class RequestsDbClient {
         return new HttpEntity<>(headers);
     }
 
+    private <T> T getSingleResponse(URI uri, Class<T> clazz) {
+        try {
+            HttpEntity<?> entity = getHttpEntity();
+            return restTemplate.exchange(uri, HttpMethod.GET, entity, clazz).getBody();
+        } catch (HttpClientErrorException e) {
+            if (HttpStatus.SC_NOT_FOUND == e.getStatusCode().value()) {
+                return null;
+            }
+            throw e;
+        }
+    }
+
+    private <T> List<T> getMultipleResponse(URI uri, ParameterizedTypeReference<List<T>> type) {
+        try {
+            HttpEntity<?> entity = getHttpEntity();
+            return restTemplate.exchange(uri, HttpMethod.GET, entity, type).getBody();
+        } catch (HttpClientErrorException e) {
+            if (HttpStatus.SC_NOT_FOUND == e.getStatusCode().value()) {
+                return new ArrayList<T>();
+            }
+            throw e;
+        }
+    }
+
+    private <T> T postSingleResponse(URI uri, HttpEntity<?> payload, Class<T> clazz) {
+        try {
+            HttpEntity<?> entity = new HttpEntity<>(payload.getBody(), getHttpHeaders());
+            return restTemplate.exchange(uri, HttpMethod.POST, entity, clazz).getBody();
+        } catch (HttpClientErrorException e) {
+            if (HttpStatus.SC_NOT_FOUND == e.getStatusCode().value()) {
+                return null;
+            }
+            throw e;
+        }
+    }
+
+    private <T> List<T> postMultipleResponse(URI uri, HttpEntity<?> payload, ParameterizedTypeReference<List<T>> type) {
+        try {
+            HttpEntity<?> entity = new HttpEntity<>(payload.getBody(), getHttpHeaders());
+            ResponseEntity<List<T>> result = restTemplate.exchange(uri, HttpMethod.POST, entity, type);
+
+            return result.getBody();
+        } catch (HttpClientErrorException e) {
+            if (HttpStatus.SC_NOT_FOUND == e.getStatusCode().value()) {
+                return new ArrayList<T>();
+            }
+            throw e;
+        }
+    }
+
 }
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/client/RequestDbClientTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/client/RequestDbClientTest.java
index 0ad8d1458e..32886bf62e 100644
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/client/RequestDbClientTest.java
+++ b/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/client/RequestDbClientTest.java
@@ -1,11 +1,14 @@
 package org.onap.so.db.request.client;
 
+import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.when;
 import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
 import javax.ws.rs.core.UriBuilder;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
@@ -13,21 +16,14 @@ import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.onap.logging.filter.spring.SpringClientPayloadFilter;
 import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.db.request.beans.RequestProcessingData;
-import org.onap.so.logging.jaxrs.filter.SOSpringClientFilter;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.BufferingClientHttpRequestFactory;
-import org.springframework.http.client.ClientHttpRequestFactory;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
-import uk.co.blackpepper.bowman.ClientFactory;
-import uk.co.blackpepper.bowman.Configuration;
 
 
 @RunWith(MockitoJUnitRunner.class)
@@ -61,12 +57,16 @@ public class RequestDbClientTest {
     @Test
     public void testGetRequestProcessingDataBySoRequestIdAndIsInternalData() {
         Mockito.doReturn("host").when(requestsDbClient).getEndpoint();
-        requestsDbClient.getExternalRequestProcessingDataBySoRequestId("12345");
         URI uri = URI.create(UriBuilder
                 .fromUri("host/requestProcessingData/search/findBySoRequestIdAndIsDataInternalOrderByGroupingIdDesc")
                 .queryParam("SO_REQUEST_ID", "12345").queryParam("IS_INTERNAL_DATA", false).build().toString());
-        Mockito.verify(restTemplate, times(1)).exchange(eq(uri), eq(HttpMethod.GET), isA(HttpEntity.class),
-                eq(RequestProcessingData[].class));
+        when(restTemplate.exchange(eq(uri), eq(HttpMethod.GET), isA(HttpEntity.class),
+                isA(ParameterizedTypeReference.class))).thenReturn(
+                        new ResponseEntity<List<RequestProcessingData>>(new ArrayList<RequestProcessingData>(),
+                                HttpStatus.NOT_FOUND));
+        assertTrue(requestsDbClient.getExternalRequestProcessingDataBySoRequestId("12345").isEmpty());
+
+
     }
 
 }
diff --git a/mso-api-handlers/pom.xml b/mso-api-handlers/pom.xml
index db939a6868..86e1c5783f 100644
--- a/mso-api-handlers/pom.xml
+++ b/mso-api-handlers/pom.xml
@@ -19,7 +19,6 @@
     <module>mso-api-handler-common</module>
     <module>mso-api-handler-infra</module>
   </modules>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
diff --git a/mso-catalog-db/pom.xml b/mso-catalog-db/pom.xml
index 7444866315..0a435aa991 100644
--- a/mso-catalog-db/pom.xml
+++ b/mso-catalog-db/pom.xml
@@ -35,29 +35,12 @@
         </executions>
       </plugin>
     </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.3</version>
-          <configuration>
-            <source>1.8</source>
-            <target>1.8</target>
-            <fork>true</fork>
-            <compilerArgs>
-              <arg>-parameters</arg>
-            </compilerArgs>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
   </build>
   <dependencies>
     <dependency>
       <groupId>uk.co.blackpepper.bowman</groupId>
       <artifactId>bowman-client</artifactId>
-      <version>0.3.0</version>
+      <version>${bowman.client.version}</version>
     </dependency>
     <dependency>
       <groupId>org.onap.so</groupId>
@@ -74,11 +57,6 @@
       <artifactId>mariadb-java-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.openpojo</groupId>
-      <artifactId>openpojo</artifactId>
-      <version>0.8.6</version>
-    </dependency>
-    <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpec.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpec.java
index 20c10748b6..0d14916ee2 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpec.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpec.java
@@ -19,8 +19,10 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/activitySpec")
 @Table(name = "activity_spec")
 public class ActivitySpec implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecActivitySpecCategories.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecActivitySpecCategories.java
index 062bdd6edc..d57996bbaa 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecActivitySpecCategories.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecActivitySpecCategories.java
@@ -36,8 +36,10 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/activitySpecActivitySpecCategories")
 @Table(name = "activity_spec_to_activity_spec_categories")
 public class ActivitySpecActivitySpecCategories implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecActivitySpecParameters.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecActivitySpecParameters.java
index f3e6a09b7f..ea407aeca5 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecActivitySpecParameters.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecActivitySpecParameters.java
@@ -36,8 +36,10 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/activitySpecActivitySpecParameters")
 @Table(name = "activity_spec_to_activity_spec_parameters")
 public class ActivitySpecActivitySpecParameters implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecCategories.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecCategories.java
index 2474d5cb8c..32c17f71b2 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecCategories.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecCategories.java
@@ -11,8 +11,10 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/activitySpecCategories")
 @Table(name = "activity_spec_categories")
 public class ActivitySpecCategories implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecParameters.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecParameters.java
index ed056400b2..cd5ed3dece 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecParameters.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecParameters.java
@@ -15,8 +15,10 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/activitySpecParameters")
 @Table(name = "activity_spec_parameters")
 public class ActivitySpecParameters implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecUserParameters.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecUserParameters.java
index d23c782a1a..7e825b3a0d 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecUserParameters.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecUserParameters.java
@@ -36,8 +36,10 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/activitySpecUserParameters")
 @Table(name = "activity_spec_to_user_parameters")
 public class ActivitySpecUserParameters implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/AllottedResource.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/AllottedResource.java
index c3a662d883..19e875f8bc 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/AllottedResource.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/AllottedResource.java
@@ -39,8 +39,10 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/allottedResource")
 @Table(name = "allotted_resource")
 public class AllottedResource implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/AllottedResourceCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/AllottedResourceCustomization.java
index b3734caccc..2afb39f20e 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/AllottedResourceCustomization.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/AllottedResourceCustomization.java
@@ -39,8 +39,10 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/allottedResourceCustomization")
 @Table(name = "allotted_resource_customization")
 public class AllottedResourceCustomization implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ArRecipe.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ArRecipe.java
index 176c02c8cd..c28a78a93a 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ArRecipe.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ArRecipe.java
@@ -32,8 +32,10 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/arRecipe")
 @Table(name = "ar_recipe")
 public class ArRecipe implements Recipe, Serializable {
     private static final long serialVersionUID = 768026109321305392L;
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/BBNameSelectionReference.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/BBNameSelectionReference.java
index 9b71c970a7..63dfa6180e 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/BBNameSelectionReference.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/BBNameSelectionReference.java
@@ -31,8 +31,10 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/bbNameSelectionReference")
 @Table(name = "bbname_selection_reference")
 public class BBNameSelectionReference implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/BuildingBlockDetail.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/BuildingBlockDetail.java
index f94b8155f8..14ec4b1ac1 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/BuildingBlockDetail.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/BuildingBlockDetail.java
@@ -33,8 +33,10 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/buildingBlockDetail")
 @Table(name = "building_block_detail")
 public class BuildingBlockDetail implements Serializable {
     private static final long serialVersionUID = -2375223199178059155L;
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudIdentity.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudIdentity.java
index 7dd163bafa..61b0b11445 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudIdentity.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudIdentity.java
@@ -36,6 +36,7 @@ import javax.persistence.PrePersist;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 /**
  * EntityBean class for a CloudIdentity. This bean represents a cloud identity service instance (i.e. a DCP node) in the
@@ -43,6 +44,7 @@ import javax.persistence.TemporalType;
  *
  */
 @Entity
+@RemoteResource("/cloudIdentity")
 @Table(name = "identity_services")
 public class CloudIdentity {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudSite.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudSite.java
index 0d7fe7d38f..8e3f47552f 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudSite.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudSite.java
@@ -51,8 +51,8 @@ import uk.co.blackpepper.bowman.annotation.ResourceId;
  * will be loaded via CloudConfig object, of which it is a component
  *
  */
-@RemoteResource("/cloudSite")
 @Entity
+@RemoteResource("/cloudSite")
 @Table(name = "cloud_sites")
 @JsonAutoDetect(fieldVisibility = Visibility.ANY)
 public class CloudSite {
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudifyManager.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudifyManager.java
index a3df245ae6..33185b28c7 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudifyManager.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudifyManager.java
@@ -34,6 +34,7 @@ import javax.persistence.PrePersist;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 /**
  * EntityBean class for a Cloudify Manager. This bean represents a Cloudify node through which TOSCA-based VNFs may be
@@ -45,6 +46,7 @@ import javax.persistence.TemporalType;
  * @author JC1348
  */
 @Entity
+@RemoteResource("/cloudifyManager")
 @Table(name = "cloudify_managers")
 public class CloudifyManager {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CollectionNetworkResourceCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CollectionNetworkResourceCustomization.java
index 566268ba57..f8d05b95a2 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CollectionNetworkResourceCustomization.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CollectionNetworkResourceCustomization.java
@@ -38,8 +38,10 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/collectionNetworkResourceCustomization")
 @Table(name = "collection_network_resource_customization")
 public class CollectionNetworkResourceCustomization implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CollectionResource.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CollectionResource.java
index 9a92d0a64f..b8ec638180 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CollectionResource.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CollectionResource.java
@@ -38,8 +38,10 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/collectionResource")
 @Table(name = "collection_resource")
 public class CollectionResource implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CollectionResourceCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CollectionResourceCustomization.java
index 8214c0a074..4a547b1a8d 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CollectionResourceCustomization.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CollectionResourceCustomization.java
@@ -43,8 +43,10 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/collectionResourceCustomization")
 @DiscriminatorColumn(name = "OBJECT_TYPE")
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @Table(name = "collection_resource_customization")
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CollectionResourceInstanceGroupCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CollectionResourceInstanceGroupCustomization.java
index 4a72f9a3c2..f59ed73147 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CollectionResourceInstanceGroupCustomization.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CollectionResourceInstanceGroupCustomization.java
@@ -39,8 +39,10 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/collectionResourceInstanceGroupCustomization")
 @IdClass(CollectionResourceInstanceGroupCustomizationId.class)
 @Table(name = "collection_resource_instance_group_customization")
 public class CollectionResourceInstanceGroupCustomization implements Serializable {
@@ -60,10 +62,12 @@ public class CollectionResourceInstanceGroupCustomization implements Serializabl
     @Column(name = "INSTANCE_GROUP_MODEL_UUID")
     private String modelUUID;
 
+    @BusinessKey
     @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     @JoinColumn(name = "COLLECTION_RESOURCE_CUSTOMIZATION_MODEL_UUID", updatable = false, insertable = false)
     private CollectionResourceCustomization collectionResourceCust;
 
+    @BusinessKey
     @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     @JoinColumn(name = "INSTANCE_GROUP_MODEL_UUID", updatable = false, insertable = false)
     private InstanceGroup instanceGroup;
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ConfigurationResource.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ConfigurationResource.java
index 9c2e1de244..731b237c98 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ConfigurationResource.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ConfigurationResource.java
@@ -38,9 +38,11 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
 @Entity
+@RemoteResource("/configurationResource")
 @Table(name = "configuration")
 public class ConfigurationResource implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ConfigurationResourceCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ConfigurationResourceCustomization.java
index 3be9e1f1e3..7f5d0f531d 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ConfigurationResourceCustomization.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ConfigurationResourceCustomization.java
@@ -41,8 +41,10 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/configurationResourceCustomization")
 @Table(name = "configuration_customization")
 public class ConfigurationResourceCustomization implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ControllerSelectionReference.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ControllerSelectionReference.java
index ac0d09b13b..9b73997e36 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ControllerSelectionReference.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ControllerSelectionReference.java
@@ -29,9 +29,11 @@ import com.openpojo.business.annotation.BusinessKey;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.EqualsBuilder;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @IdClass(ControllerSelectionReferenceId.class)
 @Entity
+@RemoteResource("/controllerSelectionReference")
 @Table(name = "controller_selection_reference")
 public class ControllerSelectionReference implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CvnfcConfigurationCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CvnfcConfigurationCustomization.java
index 97518ec81b..c5575b2adf 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CvnfcConfigurationCustomization.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CvnfcConfigurationCustomization.java
@@ -41,8 +41,10 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/cvnfcConfigurationCustomization")
 @Table(name = "cvnfc_configuration_customization")
 public class CvnfcConfigurationCustomization implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CvnfcCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CvnfcCustomization.java
index f5b5d7319d..822aa50b6e 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CvnfcCustomization.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CvnfcCustomization.java
@@ -43,8 +43,10 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/cvnfcCustomization")
 @Table(name = "cvnfc_customization")
 public class CvnfcCustomization implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ExternalServiceToInternalService.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ExternalServiceToInternalService.java
index f664e79702..f05934dd53 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ExternalServiceToInternalService.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ExternalServiceToInternalService.java
@@ -31,8 +31,10 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/externalServiceToInternalService")
 @Table(name = "external_service_to_internal_model_mapping")
 public class ExternalServiceToInternalService implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/HeatEnvironment.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/HeatEnvironment.java
index 511f7cf709..8ec6c88754 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/HeatEnvironment.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/HeatEnvironment.java
@@ -34,8 +34,10 @@ import javax.persistence.TemporalType;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import com.openpojo.business.annotation.BusinessKey;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/heatEnvironment")
 @Table(name = "heat_environment")
 public class HeatEnvironment implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/HeatFiles.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/HeatFiles.java
index 3badf2ae11..b1873eebdb 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/HeatFiles.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/HeatFiles.java
@@ -34,8 +34,10 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/heatFiles")
 @Table(name = "heat_files")
 public class HeatFiles implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/HeatTemplate.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/HeatTemplate.java
index 82725f089d..ac9af180a5 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/HeatTemplate.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/HeatTemplate.java
@@ -43,8 +43,10 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/heatTemplate")
 @Table(name = "heat_template")
 public class HeatTemplate implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/HeatTemplateParam.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/HeatTemplateParam.java
index 6abf695797..e7e8ee1f32 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/HeatTemplateParam.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/HeatTemplateParam.java
@@ -30,9 +30,11 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @IdClass(HeatTemplateParamId.class)
 @Entity
+@RemoteResource("/heatTemplateParam")
 @Table(name = "heat_template_params")
 public class HeatTemplateParam implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/HomingInstance.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/HomingInstance.java
index 75871afe83..567ecae50d 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/HomingInstance.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/HomingInstance.java
@@ -38,8 +38,8 @@ import java.net.URI;
  * homing
  *
  */
-@RemoteResource("/homingInstance")
 @Entity
+@RemoteResource("/homingInstance")
 @Table(name = "homing_instances")
 public class HomingInstance {
     @JsonProperty
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/InstanceGroup.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/InstanceGroup.java
index d226ffee13..9de53ab9dc 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/InstanceGroup.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/InstanceGroup.java
@@ -46,8 +46,10 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/instanceGroup")
 @DiscriminatorColumn(name = "OBJECT_TYPE")
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @Table(name = "instance_group")
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Model.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Model.java
index 0592e8f058..e0148705ed 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Model.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Model.java
@@ -39,8 +39,10 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/model")
 @Table(name = "model")
 public class Model implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ModelRecipe.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ModelRecipe.java
index 3f89e9db74..6ddda4c911 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ModelRecipe.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ModelRecipe.java
@@ -34,8 +34,10 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/modelRecipe")
 @Table(name = "model_recipe")
 public class ModelRecipe implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkCollectionResourceCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkCollectionResourceCustomization.java
index bb9079be23..4be79aaddf 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkCollectionResourceCustomization.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkCollectionResourceCustomization.java
@@ -26,8 +26,10 @@ import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
 import javax.persistence.OneToMany;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/networkCollectionResourceCustomization")
 @DiscriminatorValue(value = "NetworkCollection")
 public class NetworkCollectionResourceCustomization extends CollectionResourceCustomization {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkInstanceGroup.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkInstanceGroup.java
index 24782efcf0..b3eb4e37f0 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkInstanceGroup.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkInstanceGroup.java
@@ -22,8 +22,10 @@ package org.onap.so.db.catalog.beans;
 
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/networkInstanceGroup")
 @DiscriminatorValue(value = "L3_NETWORK")
 public class NetworkInstanceGroup extends InstanceGroup {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkRecipe.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkRecipe.java
index 7bdbe9cdba..dce940472e 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkRecipe.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkRecipe.java
@@ -32,8 +32,10 @@ import javax.persistence.TemporalType;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import com.openpojo.business.annotation.BusinessKey;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/networkRecipe")
 @Table(name = "network_recipe")
 public class NetworkRecipe implements Serializable, Recipe {
     private static final long serialVersionUID = 768026109321305392L;
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkResource.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkResource.java
index 6876200754..65444d0819 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkResource.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkResource.java
@@ -41,8 +41,10 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/networkResource")
 @Table(name = "network_resource")
 public class NetworkResource implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkResourceCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkResourceCustomization.java
index 21b1550cb5..b4ca14ba67 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkResourceCustomization.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/NetworkResourceCustomization.java
@@ -38,8 +38,10 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/networkResourceCustomization")
 @Table(name = "network_resource_customization")
 public class NetworkResourceCustomization implements Serializable {
     public static final long serialVersionUID = -1322322139926390329L;
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/OrchestrationStatusStateTransitionDirective.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/OrchestrationStatusStateTransitionDirective.java
index fd3f387e3f..e8795dc90c 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/OrchestrationStatusStateTransitionDirective.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/OrchestrationStatusStateTransitionDirective.java
@@ -33,8 +33,10 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/orchestrationStatusStateTransitionDirective")
 @Table(name = "orchestration_status_state_transition_directive")
 public class OrchestrationStatusStateTransitionDirective implements Serializable {
     private static final long serialVersionUID = -4626396955833442376L;
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResource.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResource.java
index cb3195bbac..0e15c00cfd 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResource.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResource.java
@@ -32,8 +32,10 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/pnfResource")
 @Table(name = "pnf_resource")
 public class PnfResource implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceCustomization.java
index db0e0abd3c..d26ce84505 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceCustomization.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceCustomization.java
@@ -32,8 +32,10 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/pnfResourceCustomization")
 @Table(name = "pnf_resource_customization")
 public class PnfResourceCustomization implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceWorkflow.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceWorkflow.java
index 6e48938f19..b5d537c4c6 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceWorkflow.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceWorkflow.java
@@ -16,8 +16,10 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/pnfResourceWorkflow")
 @Table(name = "pnf_resource_to_workflow")
 public class PnfResourceWorkflow implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Service.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Service.java
index 8222b72d8f..487b3c6ad9 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Service.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Service.java
@@ -44,8 +44,10 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/service")
 @Table(name = "service")
 public class Service implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ServiceProxyResourceCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ServiceProxyResourceCustomization.java
index 60f6642823..7620a075ca 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ServiceProxyResourceCustomization.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ServiceProxyResourceCustomization.java
@@ -38,8 +38,10 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/serviceProxyResourceCustomization")
 @Table(name = "service_proxy_customization")
 public class ServiceProxyResourceCustomization implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ServiceRecipe.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ServiceRecipe.java
index 9e98041cf8..45ac333682 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ServiceRecipe.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ServiceRecipe.java
@@ -38,8 +38,10 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/serviceRecipe")
 @Table(name = "service_recipe")
 public class ServiceRecipe implements Serializable, Recipe {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/TempNetworkHeatTemplateLookup.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/TempNetworkHeatTemplateLookup.java
index b037b926f1..85b89396e4 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/TempNetworkHeatTemplateLookup.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/TempNetworkHeatTemplateLookup.java
@@ -29,8 +29,10 @@ import javax.persistence.Table;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import com.openpojo.business.annotation.BusinessKey;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/tempNetworkHeatTemplateLookup")
 @Table(name = "temp_network_heat_template_lookup")
 @IdClass(TempNetworkHeatTemplateLookupId.class)
 public class TempNetworkHeatTemplateLookup implements Serializable {
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ToscaCsar.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ToscaCsar.java
index 2f9b19ada0..426a3963ee 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ToscaCsar.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ToscaCsar.java
@@ -38,8 +38,10 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/toscaCsar")
 @Table(name = "tosca_csar")
 public class ToscaCsar implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/UserParameters.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/UserParameters.java
index 9ec61ff05f..c466fb1ede 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/UserParameters.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/UserParameters.java
@@ -15,8 +15,10 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/userParameters")
 @Table(name = "user_parameters")
 public class UserParameters implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VFCInstanceGroup.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VFCInstanceGroup.java
index ea7d1adad6..fa5a9a9bd2 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VFCInstanceGroup.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VFCInstanceGroup.java
@@ -22,8 +22,10 @@ package org.onap.so.db.catalog.beans;
 
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/vfcInstanceGroup")
 @DiscriminatorValue(value = "VNFC")
 public class VFCInstanceGroup extends InstanceGroup {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VfModule.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VfModule.java
index 0c7820f5f0..a972dbcc66 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VfModule.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VfModule.java
@@ -44,8 +44,10 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/vfModule")
 @Table(name = "vf_module")
 public class VfModule implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VfModuleCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VfModuleCustomization.java
index 83de95874c..5cacec7185 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VfModuleCustomization.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VfModuleCustomization.java
@@ -43,8 +43,10 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/vfModuleCustomization")
 @Table(name = "vf_module_customization")
 public class VfModuleCustomization implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfComponentsRecipe.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfComponentsRecipe.java
index 89121bc7e1..7ccffa4f51 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfComponentsRecipe.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfComponentsRecipe.java
@@ -31,8 +31,10 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/vnfComponentsRecipe")
 @Table(name = "vnf_components_recipe")
 public class VnfComponentsRecipe implements Serializable, Recipe {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfRecipe.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfRecipe.java
index ef3d8761c1..187fbea15c 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfRecipe.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfRecipe.java
@@ -35,8 +35,10 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/vnfRecipe")
 @Table(name = "vnf_recipe")
 public class VnfRecipe implements Serializable, Recipe {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResource.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResource.java
index fb54449d5f..c553c48f58 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResource.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResource.java
@@ -42,8 +42,10 @@ import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/vnfResource")
 @Table(name = "vnf_resource")
 public class VnfResource implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResourceCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResourceCustomization.java
index 8e1814f225..54d757ad05 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResourceCustomization.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResourceCustomization.java
@@ -44,8 +44,10 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/vnfResourceCustomization")
 @Table(name = "vnf_resource_customization")
 public class VnfResourceCustomization implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResourceWorkflow.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResourceWorkflow.java
index 21549e2646..5aee674d64 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResourceWorkflow.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResourceWorkflow.java
@@ -36,8 +36,10 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/vnfResourceWorkflow")
 @Table(name = "vnf_resource_to_workflow")
 public class VnfResourceWorkflow implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfcCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfcCustomization.java
index 413efaf12c..5b6bded5c5 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfcCustomization.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfcCustomization.java
@@ -40,8 +40,10 @@ import javax.persistence.TemporalType;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/vnfcCustomization")
 @Table(name = "vnfc_customization")
 public class VnfcCustomization implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfcInstanceGroupCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfcInstanceGroupCustomization.java
index 0f760ac91a..a95b3542b3 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfcInstanceGroupCustomization.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfcInstanceGroupCustomization.java
@@ -43,8 +43,10 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/vnfcInstanceGroupCustomization")
 
 @Table(name = "vnfc_instance_group_customization")
 public class VnfcInstanceGroupCustomization implements Serializable {
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Workflow.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Workflow.java
index fc1c753e85..05e8ddc501 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Workflow.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Workflow.java
@@ -20,8 +20,10 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/workflow")
 @Table(name = "workflow")
 public class Workflow implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/WorkflowActivitySpecSequence.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/WorkflowActivitySpecSequence.java
index e953ff2cd4..b3ffab6723 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/WorkflowActivitySpecSequence.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/WorkflowActivitySpecSequence.java
@@ -36,9 +36,11 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 
 @Entity
+@RemoteResource("/workflowActivitySpecSequence")
 @Table(name = "workflow_activity_spec_sequence")
 public class WorkflowActivitySpecSequence implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/NorthBoundRequest.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/NorthBoundRequest.java
index 6319ae01eb..fa949d0cf2 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/NorthBoundRequest.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/NorthBoundRequest.java
@@ -36,8 +36,10 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/northbound_request_ref_lookup")
 @Table(name = "northbound_request_ref_lookup")
 public class NorthBoundRequest implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/OrchestrationFlow.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/OrchestrationFlow.java
index 91b74d4d6a..3a517c3ef4 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/OrchestrationFlow.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/OrchestrationFlow.java
@@ -36,8 +36,10 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/orchestrationFlow")
 @Table(name = "orchestration_flow_reference")
 public class OrchestrationFlow implements Serializable {
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/RainyDayHandlerStatus.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/RainyDayHandlerStatus.java
index 39217c75fa..76d0368536 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/RainyDayHandlerStatus.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/RainyDayHandlerStatus.java
@@ -31,8 +31,10 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.openpojo.business.annotation.BusinessKey;
+import uk.co.blackpepper.bowman.annotation.RemoteResource;
 
 @Entity
+@RemoteResource("/rainy_day_handler_macro")
 @Table(name = "rainy_day_handler_macro")
 public class RainyDayHandlerStatus implements Serializable {
 
diff --git a/pom.xml b/pom.xml
index f19e3f2f1c..b2fd0d5898 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
     <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
     <publicNexusPath>content/repositories/public/</publicNexusPath>
     <siteNexusPath>content/sites/site/org/onap/so/${project.version}/</siteNexusPath>
-    <cxf.version>3.2.6</cxf.version>
+    <cxf.version>3.3.3</cxf.version>
     <jax.ws.rs>2.1</jax.ws.rs>
     <springboot.version>2.1.5.RELEASE</springboot.version>
     <camunda.springboot.version>3.2.0</camunda.springboot.version>
@@ -73,6 +73,8 @@
     <format.skipExecute>true</format.skipExecute>
     <io.fabric8.version>0.33.0</io.fabric8.version>
     <appc.client.version>1.7.1</appc.client.version>
+    <bowman.client.version>0.8.0</bowman.client.version>
+    <aaf.cadi.version>2.1.15</aaf.cadi.version>
   </properties>
   <distributionManagement>
     <repository>
@@ -212,9 +214,10 @@
       </resource>
     </resources>
     <plugins>
-      <!-- <plugin> <groupId>org.sonatype.plugins</groupId> <artifactId>nexus-staging-maven-plugin</artifactId> <version>1.6.7</version> 
-        <extensions>true</extensions> <configuration> <nexusUrl>${nexusproxy}</nexusUrl> <stagingProfileId>176c31dfe190a</stagingProfileId> 
-        <serverId>ecomp-staging</serverId> </configuration> </plugin> -->
+      <!-- <plugin> <groupId>org.sonatype.plugins</groupId> <artifactId>nexus-staging-maven-plugin</artifactId> 
+        <version>1.6.7</version> <extensions>true</extensions> <configuration> <nexusUrl>${nexusproxy}</nexusUrl> 
+        <stagingProfileId>176c31dfe190a</stagingProfileId> <serverId>ecomp-staging</serverId> 
+        </configuration> </plugin> -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
@@ -227,15 +230,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.6.1</version>
+        <version>3.8.0</version>
         <configuration>
           <debug>true</debug>
           <compilerArgument>-Xlint</compilerArgument>
           <verbose>true</verbose>
           <showDeprecation>true</showDeprecation>
           <showWarnings>true</showWarnings>
-          <source>1.8</source>
-          <target>1.8</target>
           <compilerArgs>
             <arg>-parameters</arg>
           </compilerArgs>
@@ -580,14 +581,17 @@
             <skipBuild>${docker.skip.build}</skipBuild>
             <skipPush>${docker.skip.push}</skipPush>
             <dockerHost>${docker.newHost}</dockerHost>
-            <!-- 1. Update address to your local docker VM. 2. Add IP to your NO_PROXY environment variable -->
+            <!-- 1. Update address to your local docker VM. 2. Add IP to 
+              your NO_PROXY environment variable -->
             <certPath>${docker.host.cert.path}</certPath>
-            <!-- Add -Ddocker.host.cert.pat="path to your local certs directory" to maven build command -->
+            <!-- Add -Ddocker.host.cert.pat="path to your local certs directory" 
+              to maven build command -->
             <pushRegistry>${dockerPushRepo}</pushRegistry>
-            <!-- Update .m2/settings.xml Add server id settings.dockerRepository, username, and password -->
+            <!-- Update .m2/settings.xml Add server id settings.dockerRepository, 
+              username, and password -->
             <pullRegistry>${dockerPullRepo}</pullRegistry>
-            <!-- If docker repo is not public. Update .m2/settings.xml Add server id settings.dockerRepository, username, 
-              and password -->
+            <!-- If docker repo is not public. Update .m2/settings.xml Add 
+              server id settings.dockerRepository, username, and password -->
             <images>
               <image>
                 <alias>service</alias>
@@ -611,7 +615,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.20</version>
+          <version>2.22.2</version>
           <configuration>
             <systemPropertyVariables>
               <so.log.level>DEBUG</so.log.level>
@@ -625,7 +629,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>2.20</version>
+          <version>2.22.2</version>
           <configuration>
             <skip>true</skip>
             <systemPropertyVariables>
@@ -823,7 +827,7 @@
     <dependency>
       <groupId>com.openpojo</groupId>
       <artifactId>openpojo</artifactId>
-      <version>0.8.10</version>
+      <version>0.8.13</version>
     </dependency>
     <dependency>
       <groupId>com.shazam</groupId>
@@ -848,6 +852,12 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+      <version>7.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>com.googlecode.junit-toolbox</groupId>
       <artifactId>junit-toolbox</artifactId>
       <version>2.4</version>
@@ -855,8 +865,6 @@
   </dependencies>
   <dependencyManagement>
     <dependencies>
-      <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
-      <!-- force use of version 4.5 everywhere in transient deps, aligned on WildFly 10 version -->
       <dependency>
         <groupId>org.onap.logging-analytics</groupId>
         <artifactId>logging-slf4j</artifactId>
@@ -985,5 +993,46 @@
         <originalClassifier />
       </properties>
     </profile>
+    <profile>
+      <id>java8</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>3.8.0</version>
+            <configuration>
+              <forceJavacCompilerUse>true</forceJavacCompilerUse>
+              <source>1.8</source>
+              <target>1.8</target>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+      <activation>
+        <property>
+          <name>m2e.version</name>
+        </property>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+    </profile>
+    <profile>
+      <id>java11</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>3.8.0</version>
+            <configuration>
+              <forceJavacCompilerUse>true</forceJavacCompilerUse>
+              <source>11</source>
+              <target>11</target>
+              <release>11</release>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>
diff --git a/so-monitoring/so-monitoring-handler/pom.xml b/so-monitoring/so-monitoring-handler/pom.xml
index 176328a434..68f8c89608 100644
--- a/so-monitoring/so-monitoring-handler/pom.xml
+++ b/so-monitoring/so-monitoring-handler/pom.xml
@@ -32,8 +32,6 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <java.version>1.8</java.version>
-    <openpojo.version>0.8.6</openpojo.version>
   </properties>
 
 
diff --git a/so-simulator/pom.xml b/so-simulator/pom.xml
index 006a6fae1a..888602cd6b 100644
--- a/so-simulator/pom.xml
+++ b/so-simulator/pom.xml
@@ -74,11 +74,8 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.7.0</version>
         <configuration>
           <encoding>${project.build.sourceEncoding}</encoding>
-          <source>1.8</source>
-          <target>1.8</target>
         </configuration>
       </plugin>
       <plugin>