From: Fiete Ostkamp Date: Thu, 24 Jul 2025 13:46:52 +0000 (+0200) Subject: Move common module into common module X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=96fb86037efaefd9a7ffcc12683a215453624a6c;p=so.git Move common module into common module - move common maven module into pom-type common module - that may seem counterintuitive but prepares further modularisation of common (spring, security, clients,...) Issue-ID: SO-4208 Change-Id: I1c3e98f07afbae8cbba2f4e6c279fb707ef767de Signed-off-by: Fiete Ostkamp --- diff --git a/adapters/etsi-sol002-adapter/pom.xml b/adapters/etsi-sol002-adapter/pom.xml index 5dee8fe8e6..7df98eedc6 100644 --- a/adapters/etsi-sol002-adapter/pom.xml +++ b/adapters/etsi-sol002-adapter/pom.xml @@ -37,7 +37,7 @@ ${project.version} - org.onap.so + org.onap.so.common common ${project.version} diff --git a/adapters/mso-adapters-rest-interface/pom.xml b/adapters/mso-adapters-rest-interface/pom.xml index da31d8d40b..ccd48909b4 100644 --- a/adapters/mso-adapters-rest-interface/pom.xml +++ b/adapters/mso-adapters-rest-interface/pom.xml @@ -70,7 +70,7 @@ ${openstack.version} - org.onap.so + org.onap.so.common common ${project.version} diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml index febccbe578..74758fec74 100644 --- a/asdc-controller/pom.xml +++ b/asdc-controller/pom.xml @@ -271,7 +271,7 @@ ${jtosca.version} - org.onap.so + org.onap.so.common common ${project.version} diff --git a/bpmn/MSOCoreBPMN/pom.xml b/bpmn/MSOCoreBPMN/pom.xml index 9c4bf33006..5ff627af06 100644 --- a/bpmn/MSOCoreBPMN/pom.xml +++ b/bpmn/MSOCoreBPMN/pom.xml @@ -69,7 +69,7 @@ Saxon-HE - org.onap.so + org.onap.so.common common ${project.version} diff --git a/bpmn/pom.xml b/bpmn/pom.xml index 50a7ea8b56..8beefa05b6 100644 --- a/bpmn/pom.xml +++ b/bpmn/pom.xml @@ -80,7 +80,7 @@ true - org.onap.so + org.onap.so.common common ${project.version} diff --git a/common/.gitignore b/common/common/.gitignore similarity index 100% rename from common/.gitignore rename to common/common/.gitignore diff --git a/common/common/pom.xml b/common/common/pom.xml new file mode 100644 index 0000000000..f38fcc8849 --- /dev/null +++ b/common/common/pom.xml @@ -0,0 +1,369 @@ + + + 4.0.0 + + org.onap.so + common + 1.16.0-SNAPSHOT + + org.onap.so.common + common + common + MSO Common classes:- Logger + + 3.22.2 + 4.1.30.Final + 1.1.5 + 9.0.105 + 1.2.13 + + + + org.apache.httpcomponents + httpclient + + + org.springframework + spring-aspects + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-actuator + + + com.jayway.jsonpath + json-path + 2.5.0 + + + org.hibernate + hibernate-core + + + org.springframework + spring-web + + + org.springframework + spring-webmvc + + + org.modelmapper + modelmapper + 2.3.2 + + + org.apache.cxf + cxf-rt-rs-client + test + + + com.shazam + shazamcrest + 0.11 + test + + + com.google.guava + guava + + + org.apache.commons + commons-lang3 + + + com.vaadin.external.google + android-json + + + + + org.apache.tomcat + tomcat-catalina + ${tomcat-catalina-version} + + + org.slf4j + slf4j-ext + + + org.slf4j + slf4j-api + + + org.springframework.boot + spring-boot-configuration-processor + true + + + org.springframework.retry + spring-retry + + + net.jodah + failsafe + 2.0.1 + + + org.mockito + mockito-core + test + + + org.json + json + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + test + + + org.reflections + reflections + 0.9.11 + + + com.zaxxer + HikariCP + + + + org.onap.ccsdk.cds.blueprintsprocessor.modules + blueprint-proto + ${ccsdk.version} + + + io.springfox + springfox-boot-starter + + + org.apache.kafka + kafka-clients + + + + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + + + io.grpc + grpc-protobuf + ${grpc.version} + + + com.google.code.findbugs + jsr305 + + + + + io.grpc + grpc-netty + ${grpc.version} + + + io.grpc + grpc-testing + ${grpc.version} + test + + + org.javatuples + javatuples + 1.2 + + + org.camunda.bpm + camunda-external-task-client + + + org.onap.appc.client + client-lib + ${appc.client.version} + + + org.mockito + mockito-core + + + org.powermock + powermock-module-junit4 + + + org.powermock + powermock-api-mockito + + + + + org.onap.appc.client + client-kit + ${appc.client.version} + + + org.mockito + mockito-core + + + + + org.projectlombok + lombok + provided + + + javax.validation + validation-api + + + com.sun.xml.bind + jaxb-core + 2.3.0 + + + com.sun.xml.bind + jaxb-impl + 2.3.0 + + + javax.cache + cache-api + 1.1.0 + + + org.springframework.cloud + spring-cloud-starter-sleuth + + + + org.apache.kafka + kafka-clients + ${kafka-clients.version} + + + uk.org.webcompere + system-stubs-jupiter + 1.1.0 + test + + + org.junit.jupiter + junit-jupiter-engine + + + + + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import + + + ch.qos.logback + logback-core + ${logback.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + + + + + src/main/resources + true + + + src/main/java + + **/*.java + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + default-test + + test + + + + **/NonSpringSuite.java + + + + + spring-tests + + test + + + + **/SpringSuite.java + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + tests-jar + package + + test-jar + + + false + + + + + + + + + maven-surefire-plugin + 3.1.2 + + + DEBUG + + 2 + suites + false + 1 + ${surefireArgLine} + + + + + + diff --git a/common/src/main/java/org/onap/so/appc/orchestrator/service/beans/ApplicationControllerTaskRequest.java b/common/common/src/main/java/org/onap/so/appc/orchestrator/service/beans/ApplicationControllerTaskRequest.java similarity index 100% rename from common/src/main/java/org/onap/so/appc/orchestrator/service/beans/ApplicationControllerTaskRequest.java rename to common/common/src/main/java/org/onap/so/appc/orchestrator/service/beans/ApplicationControllerTaskRequest.java diff --git a/common/src/main/java/org/onap/so/appc/orchestrator/service/beans/ApplicationControllerVm.java b/common/common/src/main/java/org/onap/so/appc/orchestrator/service/beans/ApplicationControllerVm.java similarity index 100% rename from common/src/main/java/org/onap/so/appc/orchestrator/service/beans/ApplicationControllerVm.java rename to common/common/src/main/java/org/onap/so/appc/orchestrator/service/beans/ApplicationControllerVm.java diff --git a/common/src/main/java/org/onap/so/appc/orchestrator/service/beans/ApplicationControllerVnf.java b/common/common/src/main/java/org/onap/so/appc/orchestrator/service/beans/ApplicationControllerVnf.java similarity index 100% rename from common/src/main/java/org/onap/so/appc/orchestrator/service/beans/ApplicationControllerVnf.java rename to common/common/src/main/java/org/onap/so/appc/orchestrator/service/beans/ApplicationControllerVnf.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/ActDeActNssi.java b/common/common/src/main/java/org/onap/so/beans/nsmf/ActDeActNssi.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/ActDeActNssi.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/ActDeActNssi.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/AdditionalProperties.java b/common/common/src/main/java/org/onap/so/beans/nsmf/AdditionalProperties.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/AdditionalProperties.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/AdditionalProperties.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/AllocateAnNssi.java b/common/common/src/main/java/org/onap/so/beans/nsmf/AllocateAnNssi.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/AllocateAnNssi.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/AllocateAnNssi.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/AllocateCnNssi.java b/common/common/src/main/java/org/onap/so/beans/nsmf/AllocateCnNssi.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/AllocateCnNssi.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/AllocateCnNssi.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/AllocateTnNssi.java b/common/common/src/main/java/org/onap/so/beans/nsmf/AllocateTnNssi.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/AllocateTnNssi.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/AllocateTnNssi.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/AnSliceProfile.java b/common/common/src/main/java/org/onap/so/beans/nsmf/AnSliceProfile.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/AnSliceProfile.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/AnSliceProfile.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/CnSliceProfile.java b/common/common/src/main/java/org/onap/so/beans/nsmf/CnSliceProfile.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/CnSliceProfile.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/CnSliceProfile.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/ConnectionLink.java b/common/common/src/main/java/org/onap/so/beans/nsmf/ConnectionLink.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/ConnectionLink.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/ConnectionLink.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/CreateCnNssi.java b/common/common/src/main/java/org/onap/so/beans/nsmf/CreateCnNssi.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/CreateCnNssi.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/CreateCnNssi.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/CustomerInfo.java b/common/common/src/main/java/org/onap/so/beans/nsmf/CustomerInfo.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/CustomerInfo.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/CustomerInfo.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/DeAllocateNssi.java b/common/common/src/main/java/org/onap/so/beans/nsmf/DeAllocateNssi.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/DeAllocateNssi.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/DeAllocateNssi.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/EndPoint.java b/common/common/src/main/java/org/onap/so/beans/nsmf/EndPoint.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/EndPoint.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/EndPoint.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/EsrInfo.java b/common/common/src/main/java/org/onap/so/beans/nsmf/EsrInfo.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/EsrInfo.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/EsrInfo.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/JobStatusRequest.java b/common/common/src/main/java/org/onap/so/beans/nsmf/JobStatusRequest.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/JobStatusRequest.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/JobStatusRequest.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/JobStatusResponse.java b/common/common/src/main/java/org/onap/so/beans/nsmf/JobStatusResponse.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/JobStatusResponse.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/JobStatusResponse.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/ModifyAction.java b/common/common/src/main/java/org/onap/so/beans/nsmf/ModifyAction.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/ModifyAction.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/ModifyAction.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/NetworkSliceInfo.java b/common/common/src/main/java/org/onap/so/beans/nsmf/NetworkSliceInfo.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/NetworkSliceInfo.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/NetworkSliceInfo.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/NetworkType.java b/common/common/src/main/java/org/onap/so/beans/nsmf/NetworkType.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/NetworkType.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/NetworkType.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/NewNsst.java b/common/common/src/main/java/org/onap/so/beans/nsmf/NewNsst.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/NewNsst.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/NewNsst.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/NsiInfo.java b/common/common/src/main/java/org/onap/so/beans/nsmf/NsiInfo.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/NsiInfo.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/NsiInfo.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/NssInstance.java b/common/common/src/main/java/org/onap/so/beans/nsmf/NssInstance.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/NssInstance.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/NssInstance.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/NssiActDeActRequest.java b/common/common/src/main/java/org/onap/so/beans/nsmf/NssiActDeActRequest.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/NssiActDeActRequest.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/NssiActDeActRequest.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/NssiAllocateRequest.java b/common/common/src/main/java/org/onap/so/beans/nsmf/NssiAllocateRequest.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/NssiAllocateRequest.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/NssiAllocateRequest.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/NssiCreateRequest.java b/common/common/src/main/java/org/onap/so/beans/nsmf/NssiCreateRequest.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/NssiCreateRequest.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/NssiCreateRequest.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/NssiDeAllocateRequest.java b/common/common/src/main/java/org/onap/so/beans/nsmf/NssiDeAllocateRequest.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/NssiDeAllocateRequest.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/NssiDeAllocateRequest.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/NssiResponse.java b/common/common/src/main/java/org/onap/so/beans/nsmf/NssiResponse.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/NssiResponse.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/NssiResponse.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/NssiTerminateRequest.java b/common/common/src/main/java/org/onap/so/beans/nsmf/NssiTerminateRequest.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/NssiTerminateRequest.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/NssiTerminateRequest.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/NssiUpdateRequest.java b/common/common/src/main/java/org/onap/so/beans/nsmf/NssiUpdateRequest.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/NssiUpdateRequest.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/NssiUpdateRequest.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/NssiUpdateRequestById.java b/common/common/src/main/java/org/onap/so/beans/nsmf/NssiUpdateRequestById.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/NssiUpdateRequestById.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/NssiUpdateRequestById.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/NssmfAdapterNBIRequest.java b/common/common/src/main/java/org/onap/so/beans/nsmf/NssmfAdapterNBIRequest.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/NssmfAdapterNBIRequest.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/NssmfAdapterNBIRequest.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/NssmfRequest.java b/common/common/src/main/java/org/onap/so/beans/nsmf/NssmfRequest.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/NssmfRequest.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/NssmfRequest.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/NssmiReqInfo.java b/common/common/src/main/java/org/onap/so/beans/nsmf/NssmiReqInfo.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/NssmiReqInfo.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/NssmiReqInfo.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/NssmiResInfo.java b/common/common/src/main/java/org/onap/so/beans/nsmf/NssmiResInfo.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/NssmiResInfo.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/NssmiResInfo.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/OperationType.java b/common/common/src/main/java/org/onap/so/beans/nsmf/OperationType.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/OperationType.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/OperationType.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/OrchestrationStatusEnum.java b/common/common/src/main/java/org/onap/so/beans/nsmf/OrchestrationStatusEnum.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/OrchestrationStatusEnum.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/OrchestrationStatusEnum.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/PerfReq.java b/common/common/src/main/java/org/onap/so/beans/nsmf/PerfReq.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/PerfReq.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/PerfReq.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/PerfReqEmbb.java b/common/common/src/main/java/org/onap/so/beans/nsmf/PerfReqEmbb.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/PerfReqEmbb.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/PerfReqEmbb.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/PerfReqUrllc.java b/common/common/src/main/java/org/onap/so/beans/nsmf/PerfReqUrllc.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/PerfReqUrllc.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/PerfReqUrllc.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/PnfErrorList.java b/common/common/src/main/java/org/onap/so/beans/nsmf/PnfErrorList.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/PnfErrorList.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/PnfErrorList.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/QuerySubnetCapability.java b/common/common/src/main/java/org/onap/so/beans/nsmf/QuerySubnetCapability.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/QuerySubnetCapability.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/QuerySubnetCapability.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/ResourceSharingLevel.java b/common/common/src/main/java/org/onap/so/beans/nsmf/ResourceSharingLevel.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/ResourceSharingLevel.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/ResourceSharingLevel.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/ResponseDescriptor.java b/common/common/src/main/java/org/onap/so/beans/nsmf/ResponseDescriptor.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/ResponseDescriptor.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/ResponseDescriptor.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/ResponseHistory.java b/common/common/src/main/java/org/onap/so/beans/nsmf/ResponseHistory.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/ResponseHistory.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/ResponseHistory.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/ServiceInfo.java b/common/common/src/main/java/org/onap/so/beans/nsmf/ServiceInfo.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/ServiceInfo.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/ServiceInfo.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/ServiceProfile.java b/common/common/src/main/java/org/onap/so/beans/nsmf/ServiceProfile.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/ServiceProfile.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/ServiceProfile.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/SliceProfile.java b/common/common/src/main/java/org/onap/so/beans/nsmf/SliceProfile.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/SliceProfile.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/SliceProfile.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java b/common/common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskInfo.java b/common/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskInfo.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/SliceTaskInfo.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskInfo.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParams.java b/common/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParams.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParams.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParams.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParamsAdapter.java b/common/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParamsAdapter.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParamsAdapter.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParamsAdapter.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/TerminateNssi.java b/common/common/src/main/java/org/onap/so/beans/nsmf/TerminateNssi.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/TerminateNssi.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/TerminateNssi.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/TnSliceProfile.java b/common/common/src/main/java/org/onap/so/beans/nsmf/TnSliceProfile.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/TnSliceProfile.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/TnSliceProfile.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/TransportSliceNetwork.java b/common/common/src/main/java/org/onap/so/beans/nsmf/TransportSliceNetwork.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/TransportSliceNetwork.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/TransportSliceNetwork.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/UeMobilityLevel.java b/common/common/src/main/java/org/onap/so/beans/nsmf/UeMobilityLevel.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/UeMobilityLevel.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/UeMobilityLevel.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/UpdateCnNssi.java b/common/common/src/main/java/org/onap/so/beans/nsmf/UpdateCnNssi.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/UpdateCnNssi.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/UpdateCnNssi.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/UpdateCnNssiById.java b/common/common/src/main/java/org/onap/so/beans/nsmf/UpdateCnNssiById.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/UpdateCnNssiById.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/UpdateCnNssiById.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/UpdateSliceProfile.java b/common/common/src/main/java/org/onap/so/beans/nsmf/UpdateSliceProfile.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/UpdateSliceProfile.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/UpdateSliceProfile.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/VnfErrorList.java b/common/common/src/main/java/org/onap/so/beans/nsmf/VnfErrorList.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/VnfErrorList.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/VnfErrorList.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/oof/NsiReqBody.java b/common/common/src/main/java/org/onap/so/beans/nsmf/oof/NsiReqBody.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/oof/NsiReqBody.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/oof/NsiReqBody.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/oof/NssiReqBody.java b/common/common/src/main/java/org/onap/so/beans/nsmf/oof/NssiReqBody.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/oof/NssiReqBody.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/oof/NssiReqBody.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/oof/RequestInfo.java b/common/common/src/main/java/org/onap/so/beans/nsmf/oof/RequestInfo.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/oof/RequestInfo.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/oof/RequestInfo.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/oof/SubnetCapability.java b/common/common/src/main/java/org/onap/so/beans/nsmf/oof/SubnetCapability.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/oof/SubnetCapability.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/oof/SubnetCapability.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/oof/SubnetType.java b/common/common/src/main/java/org/onap/so/beans/nsmf/oof/SubnetType.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/oof/SubnetType.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/oof/SubnetType.java diff --git a/common/src/main/java/org/onap/so/beans/nsmf/oof/TemplateInfo.java b/common/common/src/main/java/org/onap/so/beans/nsmf/oof/TemplateInfo.java similarity index 100% rename from common/src/main/java/org/onap/so/beans/nsmf/oof/TemplateInfo.java rename to common/common/src/main/java/org/onap/so/beans/nsmf/oof/TemplateInfo.java diff --git a/common/src/main/java/org/onap/so/client/AddCacheHeaders.java b/common/common/src/main/java/org/onap/so/client/AddCacheHeaders.java similarity index 100% rename from common/src/main/java/org/onap/so/client/AddCacheHeaders.java rename to common/common/src/main/java/org/onap/so/client/AddCacheHeaders.java diff --git a/common/src/main/java/org/onap/so/client/BaseClient.java b/common/common/src/main/java/org/onap/so/client/BaseClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/BaseClient.java rename to common/common/src/main/java/org/onap/so/client/BaseClient.java diff --git a/common/src/main/java/org/onap/so/client/CacheFactory.java b/common/common/src/main/java/org/onap/so/client/CacheFactory.java similarity index 100% rename from common/src/main/java/org/onap/so/client/CacheFactory.java rename to common/common/src/main/java/org/onap/so/client/CacheFactory.java diff --git a/common/src/main/java/org/onap/so/client/CacheProperties.java b/common/common/src/main/java/org/onap/so/client/CacheProperties.java similarity index 100% rename from common/src/main/java/org/onap/so/client/CacheProperties.java rename to common/common/src/main/java/org/onap/so/client/CacheProperties.java diff --git a/common/src/main/java/org/onap/so/client/DefaultProperties.java b/common/common/src/main/java/org/onap/so/client/DefaultProperties.java similarity index 100% rename from common/src/main/java/org/onap/so/client/DefaultProperties.java rename to common/common/src/main/java/org/onap/so/client/DefaultProperties.java diff --git a/common/src/main/java/org/onap/so/client/HttpClient.java b/common/common/src/main/java/org/onap/so/client/HttpClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/HttpClient.java rename to common/common/src/main/java/org/onap/so/client/HttpClient.java diff --git a/common/src/main/java/org/onap/so/client/HttpClientFactory.java b/common/common/src/main/java/org/onap/so/client/HttpClientFactory.java similarity index 100% rename from common/src/main/java/org/onap/so/client/HttpClientFactory.java rename to common/common/src/main/java/org/onap/so/client/HttpClientFactory.java diff --git a/common/src/main/java/org/onap/so/client/KeyStoreLoader.java b/common/common/src/main/java/org/onap/so/client/KeyStoreLoader.java similarity index 100% rename from common/src/main/java/org/onap/so/client/KeyStoreLoader.java rename to common/common/src/main/java/org/onap/so/client/KeyStoreLoader.java diff --git a/common/src/main/java/org/onap/so/client/PreconditionFailedException.java b/common/common/src/main/java/org/onap/so/client/PreconditionFailedException.java similarity index 100% rename from common/src/main/java/org/onap/so/client/PreconditionFailedException.java rename to common/common/src/main/java/org/onap/so/client/PreconditionFailedException.java diff --git a/common/src/main/java/org/onap/so/client/ResponseExceptionMapper.java b/common/common/src/main/java/org/onap/so/client/ResponseExceptionMapper.java similarity index 100% rename from common/src/main/java/org/onap/so/client/ResponseExceptionMapper.java rename to common/common/src/main/java/org/onap/so/client/ResponseExceptionMapper.java diff --git a/common/src/main/java/org/onap/so/client/ResponseExceptionMapperImpl.java b/common/common/src/main/java/org/onap/so/client/ResponseExceptionMapperImpl.java similarity index 100% rename from common/src/main/java/org/onap/so/client/ResponseExceptionMapperImpl.java rename to common/common/src/main/java/org/onap/so/client/ResponseExceptionMapperImpl.java diff --git a/common/src/main/java/org/onap/so/client/RestClient.java b/common/common/src/main/java/org/onap/so/client/RestClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/RestClient.java rename to common/common/src/main/java/org/onap/so/client/RestClient.java diff --git a/common/src/main/java/org/onap/so/client/RestClientSSL.java b/common/common/src/main/java/org/onap/so/client/RestClientSSL.java similarity index 100% rename from common/src/main/java/org/onap/so/client/RestClientSSL.java rename to common/common/src/main/java/org/onap/so/client/RestClientSSL.java diff --git a/common/src/main/java/org/onap/so/client/RestProperties.java b/common/common/src/main/java/org/onap/so/client/RestProperties.java similarity index 100% rename from common/src/main/java/org/onap/so/client/RestProperties.java rename to common/common/src/main/java/org/onap/so/client/RestProperties.java diff --git a/common/src/main/java/org/onap/so/client/RestPropertiesLoader.java b/common/common/src/main/java/org/onap/so/client/RestPropertiesLoader.java similarity index 100% rename from common/src/main/java/org/onap/so/client/RestPropertiesLoader.java rename to common/common/src/main/java/org/onap/so/client/RestPropertiesLoader.java diff --git a/common/src/main/java/org/onap/so/client/RestRequest.java b/common/common/src/main/java/org/onap/so/client/RestRequest.java similarity index 100% rename from common/src/main/java/org/onap/so/client/RestRequest.java rename to common/common/src/main/java/org/onap/so/client/RestRequest.java diff --git a/common/src/main/java/org/onap/so/client/RestTemplateConfig.java b/common/common/src/main/java/org/onap/so/client/RestTemplateConfig.java similarity index 100% rename from common/src/main/java/org/onap/so/client/RestTemplateConfig.java rename to common/common/src/main/java/org/onap/so/client/RestTemplateConfig.java diff --git a/common/src/main/java/org/onap/so/client/adapter/rest/AdapterRestClient.java b/common/common/src/main/java/org/onap/so/client/adapter/rest/AdapterRestClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/adapter/rest/AdapterRestClient.java rename to common/common/src/main/java/org/onap/so/client/adapter/rest/AdapterRestClient.java diff --git a/common/src/main/java/org/onap/so/client/adapter/rest/AdapterRestProperties.java b/common/common/src/main/java/org/onap/so/client/adapter/rest/AdapterRestProperties.java similarity index 100% rename from common/src/main/java/org/onap/so/client/adapter/rest/AdapterRestProperties.java rename to common/common/src/main/java/org/onap/so/client/adapter/rest/AdapterRestProperties.java diff --git a/common/src/main/java/org/onap/so/client/cds/BasicAuthClientInterceptor.java b/common/common/src/main/java/org/onap/so/client/cds/BasicAuthClientInterceptor.java similarity index 100% rename from common/src/main/java/org/onap/so/client/cds/BasicAuthClientInterceptor.java rename to common/common/src/main/java/org/onap/so/client/cds/BasicAuthClientInterceptor.java diff --git a/common/src/main/java/org/onap/so/client/cds/CDSProcessingClient.java b/common/common/src/main/java/org/onap/so/client/cds/CDSProcessingClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/cds/CDSProcessingClient.java rename to common/common/src/main/java/org/onap/so/client/cds/CDSProcessingClient.java diff --git a/common/src/main/java/org/onap/so/client/cds/CDSProcessingHandler.java b/common/common/src/main/java/org/onap/so/client/cds/CDSProcessingHandler.java similarity index 100% rename from common/src/main/java/org/onap/so/client/cds/CDSProcessingHandler.java rename to common/common/src/main/java/org/onap/so/client/cds/CDSProcessingHandler.java diff --git a/common/src/main/java/org/onap/so/client/cds/CDSProcessingListener.java b/common/common/src/main/java/org/onap/so/client/cds/CDSProcessingListener.java similarity index 100% rename from common/src/main/java/org/onap/so/client/cds/CDSProcessingListener.java rename to common/common/src/main/java/org/onap/so/client/cds/CDSProcessingListener.java diff --git a/common/src/main/java/org/onap/so/client/cds/CDSProperties.java b/common/common/src/main/java/org/onap/so/client/cds/CDSProperties.java similarity index 100% rename from common/src/main/java/org/onap/so/client/cds/CDSProperties.java rename to common/common/src/main/java/org/onap/so/client/cds/CDSProperties.java diff --git a/common/src/main/java/org/onap/so/client/defaultproperties/DefaultDmaapPropertiesImpl.java b/common/common/src/main/java/org/onap/so/client/defaultproperties/DefaultDmaapPropertiesImpl.java similarity index 100% rename from common/src/main/java/org/onap/so/client/defaultproperties/DefaultDmaapPropertiesImpl.java rename to common/common/src/main/java/org/onap/so/client/defaultproperties/DefaultDmaapPropertiesImpl.java diff --git a/common/src/main/java/org/onap/so/client/defaultproperties/PolicyRestPropertiesImpl.java b/common/common/src/main/java/org/onap/so/client/defaultproperties/PolicyRestPropertiesImpl.java similarity index 100% rename from common/src/main/java/org/onap/so/client/defaultproperties/PolicyRestPropertiesImpl.java rename to common/common/src/main/java/org/onap/so/client/defaultproperties/PolicyRestPropertiesImpl.java diff --git a/common/src/main/java/org/onap/so/client/dmaap/Consumer.java b/common/common/src/main/java/org/onap/so/client/dmaap/Consumer.java similarity index 100% rename from common/src/main/java/org/onap/so/client/dmaap/Consumer.java rename to common/common/src/main/java/org/onap/so/client/dmaap/Consumer.java diff --git a/common/src/main/java/org/onap/so/client/dmaap/DmaapClient.java b/common/common/src/main/java/org/onap/so/client/dmaap/DmaapClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/dmaap/DmaapClient.java rename to common/common/src/main/java/org/onap/so/client/dmaap/DmaapClient.java diff --git a/common/src/main/java/org/onap/so/client/dmaap/DmaapConsumer.java b/common/common/src/main/java/org/onap/so/client/dmaap/DmaapConsumer.java similarity index 100% rename from common/src/main/java/org/onap/so/client/dmaap/DmaapConsumer.java rename to common/common/src/main/java/org/onap/so/client/dmaap/DmaapConsumer.java diff --git a/common/src/main/java/org/onap/so/client/dmaap/DmaapProperties.java b/common/common/src/main/java/org/onap/so/client/dmaap/DmaapProperties.java similarity index 100% rename from common/src/main/java/org/onap/so/client/dmaap/DmaapProperties.java rename to common/common/src/main/java/org/onap/so/client/dmaap/DmaapProperties.java diff --git a/common/src/main/java/org/onap/so/client/dmaap/DmaapPropertiesLoader.java b/common/common/src/main/java/org/onap/so/client/dmaap/DmaapPropertiesLoader.java similarity index 100% rename from common/src/main/java/org/onap/so/client/dmaap/DmaapPropertiesLoader.java rename to common/common/src/main/java/org/onap/so/client/dmaap/DmaapPropertiesLoader.java diff --git a/common/src/main/java/org/onap/so/client/dmaap/DmaapPublisher.java b/common/common/src/main/java/org/onap/so/client/dmaap/DmaapPublisher.java similarity index 100% rename from common/src/main/java/org/onap/so/client/dmaap/DmaapPublisher.java rename to common/common/src/main/java/org/onap/so/client/dmaap/DmaapPublisher.java diff --git a/common/src/main/java/org/onap/so/client/dmaap/Publisher.java b/common/common/src/main/java/org/onap/so/client/dmaap/Publisher.java similarity index 100% rename from common/src/main/java/org/onap/so/client/dmaap/Publisher.java rename to common/common/src/main/java/org/onap/so/client/dmaap/Publisher.java diff --git a/common/src/main/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailure.java b/common/common/src/main/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailure.java similarity index 100% rename from common/src/main/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailure.java rename to common/common/src/main/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailure.java diff --git a/common/src/main/java/org/onap/so/client/dmaap/exceptions/ExceededMaximumPollingTime.java b/common/common/src/main/java/org/onap/so/client/dmaap/exceptions/ExceededMaximumPollingTime.java similarity index 100% rename from common/src/main/java/org/onap/so/client/dmaap/exceptions/ExceededMaximumPollingTime.java rename to common/common/src/main/java/org/onap/so/client/dmaap/exceptions/ExceededMaximumPollingTime.java diff --git a/common/src/main/java/org/onap/so/client/dmaap/rest/DMaaPRestClient.java b/common/common/src/main/java/org/onap/so/client/dmaap/rest/DMaaPRestClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/dmaap/rest/DMaaPRestClient.java rename to common/common/src/main/java/org/onap/so/client/dmaap/rest/DMaaPRestClient.java diff --git a/common/src/main/java/org/onap/so/client/dmaap/rest/PropertiesBean.java b/common/common/src/main/java/org/onap/so/client/dmaap/rest/PropertiesBean.java similarity index 100% rename from common/src/main/java/org/onap/so/client/dmaap/rest/PropertiesBean.java rename to common/common/src/main/java/org/onap/so/client/dmaap/rest/PropertiesBean.java diff --git a/common/src/main/java/org/onap/so/client/dmaap/rest/RestConsumer.java b/common/common/src/main/java/org/onap/so/client/dmaap/rest/RestConsumer.java similarity index 100% rename from common/src/main/java/org/onap/so/client/dmaap/rest/RestConsumer.java rename to common/common/src/main/java/org/onap/so/client/dmaap/rest/RestConsumer.java diff --git a/common/src/main/java/org/onap/so/client/dmaap/rest/RestPublisher.java b/common/common/src/main/java/org/onap/so/client/dmaap/rest/RestPublisher.java similarity index 100% rename from common/src/main/java/org/onap/so/client/dmaap/rest/RestPublisher.java rename to common/common/src/main/java/org/onap/so/client/dmaap/rest/RestPublisher.java diff --git a/common/src/main/java/org/onap/so/client/exception/BadResponseException.java b/common/common/src/main/java/org/onap/so/client/exception/BadResponseException.java similarity index 100% rename from common/src/main/java/org/onap/so/client/exception/BadResponseException.java rename to common/common/src/main/java/org/onap/so/client/exception/BadResponseException.java diff --git a/common/src/main/java/org/onap/so/client/exception/MapperException.java b/common/common/src/main/java/org/onap/so/client/exception/MapperException.java similarity index 100% rename from common/src/main/java/org/onap/so/client/exception/MapperException.java rename to common/common/src/main/java/org/onap/so/client/exception/MapperException.java diff --git a/common/src/main/java/org/onap/so/client/exceptions/SDNOException.java b/common/common/src/main/java/org/onap/so/client/exceptions/SDNOException.java similarity index 100% rename from common/src/main/java/org/onap/so/client/exceptions/SDNOException.java rename to common/common/src/main/java/org/onap/so/client/exceptions/SDNOException.java diff --git a/common/src/main/java/org/onap/so/client/grm/GRMAction.java b/common/common/src/main/java/org/onap/so/client/grm/GRMAction.java similarity index 100% rename from common/src/main/java/org/onap/so/client/grm/GRMAction.java rename to common/common/src/main/java/org/onap/so/client/grm/GRMAction.java diff --git a/common/src/main/java/org/onap/so/client/grm/GRMClient.java b/common/common/src/main/java/org/onap/so/client/grm/GRMClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/grm/GRMClient.java rename to common/common/src/main/java/org/onap/so/client/grm/GRMClient.java diff --git a/common/src/main/java/org/onap/so/client/grm/GRMProperties.java b/common/common/src/main/java/org/onap/so/client/grm/GRMProperties.java similarity index 100% rename from common/src/main/java/org/onap/so/client/grm/GRMProperties.java rename to common/common/src/main/java/org/onap/so/client/grm/GRMProperties.java diff --git a/common/src/main/java/org/onap/so/client/grm/GRMPropertiesLoader.java b/common/common/src/main/java/org/onap/so/client/grm/GRMPropertiesLoader.java similarity index 100% rename from common/src/main/java/org/onap/so/client/grm/GRMPropertiesLoader.java rename to common/common/src/main/java/org/onap/so/client/grm/GRMPropertiesLoader.java diff --git a/common/src/main/java/org/onap/so/client/grm/GRMRestClient.java b/common/common/src/main/java/org/onap/so/client/grm/GRMRestClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/grm/GRMRestClient.java rename to common/common/src/main/java/org/onap/so/client/grm/GRMRestClient.java diff --git a/common/src/main/java/org/onap/so/client/grm/GRMRestInvoker.java b/common/common/src/main/java/org/onap/so/client/grm/GRMRestInvoker.java similarity index 100% rename from common/src/main/java/org/onap/so/client/grm/GRMRestInvoker.java rename to common/common/src/main/java/org/onap/so/client/grm/GRMRestInvoker.java diff --git a/common/src/main/java/org/onap/so/client/grm/beans/OperationalInfo.java b/common/common/src/main/java/org/onap/so/client/grm/beans/OperationalInfo.java similarity index 100% rename from common/src/main/java/org/onap/so/client/grm/beans/OperationalInfo.java rename to common/common/src/main/java/org/onap/so/client/grm/beans/OperationalInfo.java diff --git a/common/src/main/java/org/onap/so/client/grm/beans/Property.java b/common/common/src/main/java/org/onap/so/client/grm/beans/Property.java similarity index 100% rename from common/src/main/java/org/onap/so/client/grm/beans/Property.java rename to common/common/src/main/java/org/onap/so/client/grm/beans/Property.java diff --git a/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPoint.java b/common/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPoint.java similarity index 100% rename from common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPoint.java rename to common/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPoint.java diff --git a/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointList.java b/common/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointList.java similarity index 100% rename from common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointList.java rename to common/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointList.java diff --git a/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookup.java b/common/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookup.java similarity index 100% rename from common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookup.java rename to common/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookup.java diff --git a/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookupRequest.java b/common/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookupRequest.java similarity index 100% rename from common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookupRequest.java rename to common/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookupRequest.java diff --git a/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointRequest.java b/common/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointRequest.java similarity index 100% rename from common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointRequest.java rename to common/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointRequest.java diff --git a/common/src/main/java/org/onap/so/client/grm/beans/Status.java b/common/common/src/main/java/org/onap/so/client/grm/beans/Status.java similarity index 100% rename from common/src/main/java/org/onap/so/client/grm/beans/Status.java rename to common/common/src/main/java/org/onap/so/client/grm/beans/Status.java diff --git a/common/src/main/java/org/onap/so/client/grm/beans/Version.java b/common/common/src/main/java/org/onap/so/client/grm/beans/Version.java similarity index 100% rename from common/src/main/java/org/onap/so/client/grm/beans/Version.java rename to common/common/src/main/java/org/onap/so/client/grm/beans/Version.java diff --git a/common/src/main/java/org/onap/so/client/grm/beans/VersionLookup.java b/common/common/src/main/java/org/onap/so/client/grm/beans/VersionLookup.java similarity index 100% rename from common/src/main/java/org/onap/so/client/grm/beans/VersionLookup.java rename to common/common/src/main/java/org/onap/so/client/grm/beans/VersionLookup.java diff --git a/common/src/main/java/org/onap/so/client/grm/exceptions/GRMClientCallFailed.java b/common/common/src/main/java/org/onap/so/client/grm/exceptions/GRMClientCallFailed.java similarity index 100% rename from common/src/main/java/org/onap/so/client/grm/exceptions/GRMClientCallFailed.java rename to common/common/src/main/java/org/onap/so/client/grm/exceptions/GRMClientCallFailed.java diff --git a/common/src/main/java/org/onap/so/client/kafka/KafkaClient.java b/common/common/src/main/java/org/onap/so/client/kafka/KafkaClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/kafka/KafkaClient.java rename to common/common/src/main/java/org/onap/so/client/kafka/KafkaClient.java diff --git a/common/src/main/java/org/onap/so/client/kafka/KafkaConsumerImpl.java b/common/common/src/main/java/org/onap/so/client/kafka/KafkaConsumerImpl.java similarity index 100% rename from common/src/main/java/org/onap/so/client/kafka/KafkaConsumerImpl.java rename to common/common/src/main/java/org/onap/so/client/kafka/KafkaConsumerImpl.java diff --git a/common/src/main/java/org/onap/so/client/policy/CommonObjectMapperProvider.java b/common/common/src/main/java/org/onap/so/client/policy/CommonObjectMapperProvider.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/CommonObjectMapperProvider.java rename to common/common/src/main/java/org/onap/so/client/policy/CommonObjectMapperProvider.java diff --git a/common/src/main/java/org/onap/so/client/policy/DecisionAttributes.java b/common/common/src/main/java/org/onap/so/client/policy/DecisionAttributes.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/DecisionAttributes.java rename to common/common/src/main/java/org/onap/so/client/policy/DecisionAttributes.java diff --git a/common/src/main/java/org/onap/so/client/policy/JettisonStyleMapperProvider.java b/common/common/src/main/java/org/onap/so/client/policy/JettisonStyleMapperProvider.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/JettisonStyleMapperProvider.java rename to common/common/src/main/java/org/onap/so/client/policy/JettisonStyleMapperProvider.java diff --git a/common/src/main/java/org/onap/so/client/policy/PolicyClient.java b/common/common/src/main/java/org/onap/so/client/policy/PolicyClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/PolicyClient.java rename to common/common/src/main/java/org/onap/so/client/policy/PolicyClient.java diff --git a/common/src/main/java/org/onap/so/client/policy/PolicyClientImpl.java b/common/common/src/main/java/org/onap/so/client/policy/PolicyClientImpl.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/PolicyClientImpl.java rename to common/common/src/main/java/org/onap/so/client/policy/PolicyClientImpl.java diff --git a/common/src/main/java/org/onap/so/client/policy/PolicyRestClient.java b/common/common/src/main/java/org/onap/so/client/policy/PolicyRestClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/PolicyRestClient.java rename to common/common/src/main/java/org/onap/so/client/policy/PolicyRestClient.java diff --git a/common/src/main/java/org/onap/so/client/policy/PolicyRestProperties.java b/common/common/src/main/java/org/onap/so/client/policy/PolicyRestProperties.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/PolicyRestProperties.java rename to common/common/src/main/java/org/onap/so/client/policy/PolicyRestProperties.java diff --git a/common/src/main/java/org/onap/so/client/policy/entities/AllowedTreatments.java b/common/common/src/main/java/org/onap/so/client/policy/entities/AllowedTreatments.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/entities/AllowedTreatments.java rename to common/common/src/main/java/org/onap/so/client/policy/entities/AllowedTreatments.java diff --git a/common/src/main/java/org/onap/so/client/policy/entities/Bbid.java b/common/common/src/main/java/org/onap/so/client/policy/entities/Bbid.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/entities/Bbid.java rename to common/common/src/main/java/org/onap/so/client/policy/entities/Bbid.java diff --git a/common/src/main/java/org/onap/so/client/policy/entities/Config.java b/common/common/src/main/java/org/onap/so/client/policy/entities/Config.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/entities/Config.java rename to common/common/src/main/java/org/onap/so/client/policy/entities/Config.java diff --git a/common/src/main/java/org/onap/so/client/policy/entities/ConfigRequestParameters.java b/common/common/src/main/java/org/onap/so/client/policy/entities/ConfigRequestParameters.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/entities/ConfigRequestParameters.java rename to common/common/src/main/java/org/onap/so/client/policy/entities/ConfigRequestParameters.java diff --git a/common/src/main/java/org/onap/so/client/policy/entities/Content.java b/common/common/src/main/java/org/onap/so/client/policy/entities/Content.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/entities/Content.java rename to common/common/src/main/java/org/onap/so/client/policy/entities/Content.java diff --git a/common/src/main/java/org/onap/so/client/policy/entities/DecisionAttributes.java b/common/common/src/main/java/org/onap/so/client/policy/entities/DecisionAttributes.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/entities/DecisionAttributes.java rename to common/common/src/main/java/org/onap/so/client/policy/entities/DecisionAttributes.java diff --git a/common/src/main/java/org/onap/so/client/policy/entities/DictionaryData.java b/common/common/src/main/java/org/onap/so/client/policy/entities/DictionaryData.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/entities/DictionaryData.java rename to common/common/src/main/java/org/onap/so/client/policy/entities/DictionaryData.java diff --git a/common/src/main/java/org/onap/so/client/policy/entities/DictionaryItemsRequest.java b/common/common/src/main/java/org/onap/so/client/policy/entities/DictionaryItemsRequest.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/entities/DictionaryItemsRequest.java rename to common/common/src/main/java/org/onap/so/client/policy/entities/DictionaryItemsRequest.java diff --git a/common/src/main/java/org/onap/so/client/policy/entities/DictionaryJson.java b/common/common/src/main/java/org/onap/so/client/policy/entities/DictionaryJson.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/entities/DictionaryJson.java rename to common/common/src/main/java/org/onap/so/client/policy/entities/DictionaryJson.java diff --git a/common/src/main/java/org/onap/so/client/policy/entities/FabricConfigModel.java b/common/common/src/main/java/org/onap/so/client/policy/entities/FabricConfigModel.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/entities/FabricConfigModel.java rename to common/common/src/main/java/org/onap/so/client/policy/entities/FabricConfigModel.java diff --git a/common/src/main/java/org/onap/so/client/policy/entities/Id.java b/common/common/src/main/java/org/onap/so/client/policy/entities/Id.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/entities/Id.java rename to common/common/src/main/java/org/onap/so/client/policy/entities/Id.java diff --git a/common/src/main/java/org/onap/so/client/policy/entities/PolicyConfig.java b/common/common/src/main/java/org/onap/so/client/policy/entities/PolicyConfig.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/entities/PolicyConfig.java rename to common/common/src/main/java/org/onap/so/client/policy/entities/PolicyConfig.java diff --git a/common/src/main/java/org/onap/so/client/policy/entities/PolicyDecision.java b/common/common/src/main/java/org/onap/so/client/policy/entities/PolicyDecision.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/entities/PolicyDecision.java rename to common/common/src/main/java/org/onap/so/client/policy/entities/PolicyDecision.java diff --git a/common/src/main/java/org/onap/so/client/policy/entities/PolicyDecisionRequest.java b/common/common/src/main/java/org/onap/so/client/policy/entities/PolicyDecisionRequest.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/entities/PolicyDecisionRequest.java rename to common/common/src/main/java/org/onap/so/client/policy/entities/PolicyDecisionRequest.java diff --git a/common/src/main/java/org/onap/so/client/policy/entities/PolicyServiceType.java b/common/common/src/main/java/org/onap/so/client/policy/entities/PolicyServiceType.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/entities/PolicyServiceType.java rename to common/common/src/main/java/org/onap/so/client/policy/entities/PolicyServiceType.java diff --git a/common/src/main/java/org/onap/so/client/policy/entities/Treatments.java b/common/common/src/main/java/org/onap/so/client/policy/entities/Treatments.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/entities/Treatments.java rename to common/common/src/main/java/org/onap/so/client/policy/entities/Treatments.java diff --git a/common/src/main/java/org/onap/so/client/policy/entities/Workstep.java b/common/common/src/main/java/org/onap/so/client/policy/entities/Workstep.java similarity index 100% rename from common/src/main/java/org/onap/so/client/policy/entities/Workstep.java rename to common/common/src/main/java/org/onap/so/client/policy/entities/Workstep.java diff --git a/common/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapConsumer.java b/common/common/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapConsumer.java similarity index 100% rename from common/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapConsumer.java rename to common/common/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapConsumer.java diff --git a/common/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapPublisher.java b/common/common/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapPublisher.java similarity index 100% rename from common/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapPublisher.java rename to common/common/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapPublisher.java diff --git a/common/src/main/java/org/onap/so/cloud/resource/beans/CloudInformation.java b/common/common/src/main/java/org/onap/so/cloud/resource/beans/CloudInformation.java similarity index 100% rename from common/src/main/java/org/onap/so/cloud/resource/beans/CloudInformation.java rename to common/common/src/main/java/org/onap/so/cloud/resource/beans/CloudInformation.java diff --git a/common/src/main/java/org/onap/so/cloud/resource/beans/NodeType.java b/common/common/src/main/java/org/onap/so/cloud/resource/beans/NodeType.java similarity index 100% rename from common/src/main/java/org/onap/so/cloud/resource/beans/NodeType.java rename to common/common/src/main/java/org/onap/so/cloud/resource/beans/NodeType.java diff --git a/common/src/main/java/org/onap/so/configuration/rest/BasicHttpHeadersProvider.java b/common/common/src/main/java/org/onap/so/configuration/rest/BasicHttpHeadersProvider.java similarity index 100% rename from common/src/main/java/org/onap/so/configuration/rest/BasicHttpHeadersProvider.java rename to common/common/src/main/java/org/onap/so/configuration/rest/BasicHttpHeadersProvider.java diff --git a/common/src/main/java/org/onap/so/configuration/rest/HttpClientConnectionConfiguration.java b/common/common/src/main/java/org/onap/so/configuration/rest/HttpClientConnectionConfiguration.java similarity index 100% rename from common/src/main/java/org/onap/so/configuration/rest/HttpClientConnectionConfiguration.java rename to common/common/src/main/java/org/onap/so/configuration/rest/HttpClientConnectionConfiguration.java diff --git a/common/src/main/java/org/onap/so/configuration/rest/HttpComponentsClientConfiguration.java b/common/common/src/main/java/org/onap/so/configuration/rest/HttpComponentsClientConfiguration.java similarity index 100% rename from common/src/main/java/org/onap/so/configuration/rest/HttpComponentsClientConfiguration.java rename to common/common/src/main/java/org/onap/so/configuration/rest/HttpComponentsClientConfiguration.java diff --git a/common/src/main/java/org/onap/so/configuration/rest/HttpHeadersProvider.java b/common/common/src/main/java/org/onap/so/configuration/rest/HttpHeadersProvider.java similarity index 100% rename from common/src/main/java/org/onap/so/configuration/rest/HttpHeadersProvider.java rename to common/common/src/main/java/org/onap/so/configuration/rest/HttpHeadersProvider.java diff --git a/common/src/main/java/org/onap/so/constants/Defaults.java b/common/common/src/main/java/org/onap/so/constants/Defaults.java similarity index 100% rename from common/src/main/java/org/onap/so/constants/Defaults.java rename to common/common/src/main/java/org/onap/so/constants/Defaults.java diff --git a/common/src/main/java/org/onap/so/constants/OrchestrationRequestFormat.java b/common/common/src/main/java/org/onap/so/constants/OrchestrationRequestFormat.java similarity index 100% rename from common/src/main/java/org/onap/so/constants/OrchestrationRequestFormat.java rename to common/common/src/main/java/org/onap/so/constants/OrchestrationRequestFormat.java diff --git a/common/src/main/java/org/onap/so/constants/Status.java b/common/common/src/main/java/org/onap/so/constants/Status.java similarity index 100% rename from common/src/main/java/org/onap/so/constants/Status.java rename to common/common/src/main/java/org/onap/so/constants/Status.java diff --git a/common/src/main/java/org/onap/so/db/connections/DbDnsIpAddress.java b/common/common/src/main/java/org/onap/so/db/connections/DbDnsIpAddress.java similarity index 100% rename from common/src/main/java/org/onap/so/db/connections/DbDnsIpAddress.java rename to common/common/src/main/java/org/onap/so/db/connections/DbDnsIpAddress.java diff --git a/common/src/main/java/org/onap/so/db/connections/ScheduledDnsLookup.java b/common/common/src/main/java/org/onap/so/db/connections/ScheduledDnsLookup.java similarity index 100% rename from common/src/main/java/org/onap/so/db/connections/ScheduledDnsLookup.java rename to common/common/src/main/java/org/onap/so/db/connections/ScheduledDnsLookup.java diff --git a/common/src/main/java/org/onap/so/entity/MsoRequest.java b/common/common/src/main/java/org/onap/so/entity/MsoRequest.java similarity index 100% rename from common/src/main/java/org/onap/so/entity/MsoRequest.java rename to common/common/src/main/java/org/onap/so/entity/MsoRequest.java diff --git a/common/src/main/java/org/onap/so/entity/package-info.java b/common/common/src/main/java/org/onap/so/entity/package-info.java similarity index 100% rename from common/src/main/java/org/onap/so/entity/package-info.java rename to common/common/src/main/java/org/onap/so/entity/package-info.java diff --git a/common/src/main/java/org/onap/so/exceptions/MSOException.java b/common/common/src/main/java/org/onap/so/exceptions/MSOException.java similarity index 100% rename from common/src/main/java/org/onap/so/exceptions/MSOException.java rename to common/common/src/main/java/org/onap/so/exceptions/MSOException.java diff --git a/common/src/main/java/org/onap/so/exceptions/MarshallerException.java b/common/common/src/main/java/org/onap/so/exceptions/MarshallerException.java similarity index 100% rename from common/src/main/java/org/onap/so/exceptions/MarshallerException.java rename to common/common/src/main/java/org/onap/so/exceptions/MarshallerException.java diff --git a/common/src/main/java/org/onap/so/exceptions/ValidationException.java b/common/common/src/main/java/org/onap/so/exceptions/ValidationException.java similarity index 100% rename from common/src/main/java/org/onap/so/exceptions/ValidationException.java rename to common/common/src/main/java/org/onap/so/exceptions/ValidationException.java diff --git a/common/src/main/java/org/onap/so/jsonpath/JsonPathUtil.java b/common/common/src/main/java/org/onap/so/jsonpath/JsonPathUtil.java similarity index 100% rename from common/src/main/java/org/onap/so/jsonpath/JsonPathUtil.java rename to common/common/src/main/java/org/onap/so/jsonpath/JsonPathUtil.java diff --git a/common/src/main/java/org/onap/so/listener/ListenerRunner.java b/common/common/src/main/java/org/onap/so/listener/ListenerRunner.java similarity index 100% rename from common/src/main/java/org/onap/so/listener/ListenerRunner.java rename to common/common/src/main/java/org/onap/so/listener/ListenerRunner.java diff --git a/common/src/main/java/org/onap/so/listener/Skip.java b/common/common/src/main/java/org/onap/so/listener/Skip.java similarity index 100% rename from common/src/main/java/org/onap/so/listener/Skip.java rename to common/common/src/main/java/org/onap/so/listener/Skip.java diff --git a/common/src/main/java/org/onap/so/logger/HttpHeadersConstants.java b/common/common/src/main/java/org/onap/so/logger/HttpHeadersConstants.java similarity index 100% rename from common/src/main/java/org/onap/so/logger/HttpHeadersConstants.java rename to common/common/src/main/java/org/onap/so/logger/HttpHeadersConstants.java diff --git a/common/src/main/java/org/onap/so/logger/LogConstants.java b/common/common/src/main/java/org/onap/so/logger/LogConstants.java similarity index 100% rename from common/src/main/java/org/onap/so/logger/LogConstants.java rename to common/common/src/main/java/org/onap/so/logger/LogConstants.java diff --git a/common/src/main/java/org/onap/so/logger/LoggerStartupListener.java b/common/common/src/main/java/org/onap/so/logger/LoggerStartupListener.java similarity index 100% rename from common/src/main/java/org/onap/so/logger/LoggerStartupListener.java rename to common/common/src/main/java/org/onap/so/logger/LoggerStartupListener.java diff --git a/common/src/main/java/org/onap/so/logger/LoggingAnchor.java b/common/common/src/main/java/org/onap/so/logger/LoggingAnchor.java similarity index 100% rename from common/src/main/java/org/onap/so/logger/LoggingAnchor.java rename to common/common/src/main/java/org/onap/so/logger/LoggingAnchor.java diff --git a/common/src/main/java/org/onap/so/logger/MaskLogStatements.java b/common/common/src/main/java/org/onap/so/logger/MaskLogStatements.java similarity index 100% rename from common/src/main/java/org/onap/so/logger/MaskLogStatements.java rename to common/common/src/main/java/org/onap/so/logger/MaskLogStatements.java diff --git a/common/src/main/java/org/onap/so/logger/MdcConstants.java b/common/common/src/main/java/org/onap/so/logger/MdcConstants.java similarity index 100% rename from common/src/main/java/org/onap/so/logger/MdcConstants.java rename to common/common/src/main/java/org/onap/so/logger/MdcConstants.java diff --git a/common/src/main/java/org/onap/so/logger/MessageEnum.java b/common/common/src/main/java/org/onap/so/logger/MessageEnum.java similarity index 100% rename from common/src/main/java/org/onap/so/logger/MessageEnum.java rename to common/common/src/main/java/org/onap/so/logger/MessageEnum.java diff --git a/common/src/main/java/org/onap/so/logging/jaxrs/filter/SOAuditLogContainerFilter.java b/common/common/src/main/java/org/onap/so/logging/jaxrs/filter/SOAuditLogContainerFilter.java similarity index 100% rename from common/src/main/java/org/onap/so/logging/jaxrs/filter/SOAuditLogContainerFilter.java rename to common/common/src/main/java/org/onap/so/logging/jaxrs/filter/SOAuditLogContainerFilter.java diff --git a/common/src/main/java/org/onap/so/logging/jaxrs/filter/SOMetricLogClientFilter.java b/common/common/src/main/java/org/onap/so/logging/jaxrs/filter/SOMetricLogClientFilter.java similarity index 100% rename from common/src/main/java/org/onap/so/logging/jaxrs/filter/SOMetricLogClientFilter.java rename to common/common/src/main/java/org/onap/so/logging/jaxrs/filter/SOMetricLogClientFilter.java diff --git a/common/src/main/java/org/onap/so/logging/jaxrs/filter/SOSpringClientFilter.java b/common/common/src/main/java/org/onap/so/logging/jaxrs/filter/SOSpringClientFilter.java similarity index 100% rename from common/src/main/java/org/onap/so/logging/jaxrs/filter/SOSpringClientFilter.java rename to common/common/src/main/java/org/onap/so/logging/jaxrs/filter/SOSpringClientFilter.java diff --git a/common/src/main/java/org/onap/so/logging/tasks/AuditMDCSetup.java b/common/common/src/main/java/org/onap/so/logging/tasks/AuditMDCSetup.java similarity index 100% rename from common/src/main/java/org/onap/so/logging/tasks/AuditMDCSetup.java rename to common/common/src/main/java/org/onap/so/logging/tasks/AuditMDCSetup.java diff --git a/common/src/main/java/org/onap/so/moi/Attributes.java b/common/common/src/main/java/org/onap/so/moi/Attributes.java similarity index 100% rename from common/src/main/java/org/onap/so/moi/Attributes.java rename to common/common/src/main/java/org/onap/so/moi/Attributes.java diff --git a/common/src/main/java/org/onap/so/moi/GETMoiResponse.java b/common/common/src/main/java/org/onap/so/moi/GETMoiResponse.java similarity index 100% rename from common/src/main/java/org/onap/so/moi/GETMoiResponse.java rename to common/common/src/main/java/org/onap/so/moi/GETMoiResponse.java diff --git a/common/src/main/java/org/onap/so/moi/MoiAllocateRequest.java b/common/common/src/main/java/org/onap/so/moi/MoiAllocateRequest.java similarity index 100% rename from common/src/main/java/org/onap/so/moi/MoiAllocateRequest.java rename to common/common/src/main/java/org/onap/so/moi/MoiAllocateRequest.java diff --git a/common/src/main/java/org/onap/so/moi/PlmnId.java b/common/common/src/main/java/org/onap/so/moi/PlmnId.java similarity index 100% rename from common/src/main/java/org/onap/so/moi/PlmnId.java rename to common/common/src/main/java/org/onap/so/moi/PlmnId.java diff --git a/common/src/main/java/org/onap/so/moi/PlmnInfo.java b/common/common/src/main/java/org/onap/so/moi/PlmnInfo.java similarity index 100% rename from common/src/main/java/org/onap/so/moi/PlmnInfo.java rename to common/common/src/main/java/org/onap/so/moi/PlmnInfo.java diff --git a/common/src/main/java/org/onap/so/moi/RANSliceSubnetProfile.java b/common/common/src/main/java/org/onap/so/moi/RANSliceSubnetProfile.java similarity index 100% rename from common/src/main/java/org/onap/so/moi/RANSliceSubnetProfile.java rename to common/common/src/main/java/org/onap/so/moi/RANSliceSubnetProfile.java diff --git a/common/src/main/java/org/onap/so/moi/SliceProfile.java b/common/common/src/main/java/org/onap/so/moi/SliceProfile.java similarity index 100% rename from common/src/main/java/org/onap/so/moi/SliceProfile.java rename to common/common/src/main/java/org/onap/so/moi/SliceProfile.java diff --git a/common/src/main/java/org/onap/so/moi/Snssai.java b/common/common/src/main/java/org/onap/so/moi/Snssai.java similarity index 100% rename from common/src/main/java/org/onap/so/moi/Snssai.java rename to common/common/src/main/java/org/onap/so/moi/Snssai.java diff --git a/common/src/main/java/org/onap/so/objects/audit/AAIObjectAudit.java b/common/common/src/main/java/org/onap/so/objects/audit/AAIObjectAudit.java similarity index 100% rename from common/src/main/java/org/onap/so/objects/audit/AAIObjectAudit.java rename to common/common/src/main/java/org/onap/so/objects/audit/AAIObjectAudit.java diff --git a/common/src/main/java/org/onap/so/objects/audit/AAIObjectAuditList.java b/common/common/src/main/java/org/onap/so/objects/audit/AAIObjectAuditList.java similarity index 100% rename from common/src/main/java/org/onap/so/objects/audit/AAIObjectAuditList.java rename to common/common/src/main/java/org/onap/so/objects/audit/AAIObjectAuditList.java diff --git a/common/src/main/java/org/onap/so/openpojo/rules/CustomSetterMustExistRule.java b/common/common/src/main/java/org/onap/so/openpojo/rules/CustomSetterMustExistRule.java similarity index 100% rename from common/src/main/java/org/onap/so/openpojo/rules/CustomSetterMustExistRule.java rename to common/common/src/main/java/org/onap/so/openpojo/rules/CustomSetterMustExistRule.java diff --git a/common/src/main/java/org/onap/so/openpojo/rules/EqualsAndHashCodeTester.java b/common/common/src/main/java/org/onap/so/openpojo/rules/EqualsAndHashCodeTester.java similarity index 100% rename from common/src/main/java/org/onap/so/openpojo/rules/EqualsAndHashCodeTester.java rename to common/common/src/main/java/org/onap/so/openpojo/rules/EqualsAndHashCodeTester.java diff --git a/common/src/main/java/org/onap/so/openpojo/rules/HasAnnotationMatcher.java b/common/common/src/main/java/org/onap/so/openpojo/rules/HasAnnotationMatcher.java similarity index 100% rename from common/src/main/java/org/onap/so/openpojo/rules/HasAnnotationMatcher.java rename to common/common/src/main/java/org/onap/so/openpojo/rules/HasAnnotationMatcher.java diff --git a/common/src/main/java/org/onap/so/openpojo/rules/HasAnnotationPropertyWithValueMatcher.java b/common/common/src/main/java/org/onap/so/openpojo/rules/HasAnnotationPropertyWithValueMatcher.java similarity index 100% rename from common/src/main/java/org/onap/so/openpojo/rules/HasAnnotationPropertyWithValueMatcher.java rename to common/common/src/main/java/org/onap/so/openpojo/rules/HasAnnotationPropertyWithValueMatcher.java diff --git a/common/src/main/java/org/onap/so/openpojo/rules/HasEqualsAndHashCodeRule.java b/common/common/src/main/java/org/onap/so/openpojo/rules/HasEqualsAndHashCodeRule.java similarity index 100% rename from common/src/main/java/org/onap/so/openpojo/rules/HasEqualsAndHashCodeRule.java rename to common/common/src/main/java/org/onap/so/openpojo/rules/HasEqualsAndHashCodeRule.java diff --git a/common/src/main/java/org/onap/so/openpojo/rules/HasToStringRule.java b/common/common/src/main/java/org/onap/so/openpojo/rules/HasToStringRule.java similarity index 100% rename from common/src/main/java/org/onap/so/openpojo/rules/HasToStringRule.java rename to common/common/src/main/java/org/onap/so/openpojo/rules/HasToStringRule.java diff --git a/common/src/main/java/org/onap/so/openpojo/rules/ToStringTester.java b/common/common/src/main/java/org/onap/so/openpojo/rules/ToStringTester.java similarity index 100% rename from common/src/main/java/org/onap/so/openpojo/rules/ToStringTester.java rename to common/common/src/main/java/org/onap/so/openpojo/rules/ToStringTester.java diff --git a/common/src/main/java/org/onap/so/properties/MsoDatabaseException.java b/common/common/src/main/java/org/onap/so/properties/MsoDatabaseException.java similarity index 100% rename from common/src/main/java/org/onap/so/properties/MsoDatabaseException.java rename to common/common/src/main/java/org/onap/so/properties/MsoDatabaseException.java diff --git a/common/src/main/java/org/onap/so/rest/exceptions/ExhaustedRetriesException.java b/common/common/src/main/java/org/onap/so/rest/exceptions/ExhaustedRetriesException.java similarity index 100% rename from common/src/main/java/org/onap/so/rest/exceptions/ExhaustedRetriesException.java rename to common/common/src/main/java/org/onap/so/rest/exceptions/ExhaustedRetriesException.java diff --git a/common/src/main/java/org/onap/so/rest/exceptions/HttpResouceNotFoundException.java b/common/common/src/main/java/org/onap/so/rest/exceptions/HttpResouceNotFoundException.java similarity index 100% rename from common/src/main/java/org/onap/so/rest/exceptions/HttpResouceNotFoundException.java rename to common/common/src/main/java/org/onap/so/rest/exceptions/HttpResouceNotFoundException.java diff --git a/common/src/main/java/org/onap/so/rest/exceptions/InvalidRestRequestException.java b/common/common/src/main/java/org/onap/so/rest/exceptions/InvalidRestRequestException.java similarity index 100% rename from common/src/main/java/org/onap/so/rest/exceptions/InvalidRestRequestException.java rename to common/common/src/main/java/org/onap/so/rest/exceptions/InvalidRestRequestException.java diff --git a/common/src/main/java/org/onap/so/rest/exceptions/RestProcessingException.java b/common/common/src/main/java/org/onap/so/rest/exceptions/RestProcessingException.java similarity index 100% rename from common/src/main/java/org/onap/so/rest/exceptions/RestProcessingException.java rename to common/common/src/main/java/org/onap/so/rest/exceptions/RestProcessingException.java diff --git a/common/src/main/java/org/onap/so/rest/service/HttpRestServiceProvider.java b/common/common/src/main/java/org/onap/so/rest/service/HttpRestServiceProvider.java similarity index 100% rename from common/src/main/java/org/onap/so/rest/service/HttpRestServiceProvider.java rename to common/common/src/main/java/org/onap/so/rest/service/HttpRestServiceProvider.java diff --git a/common/src/main/java/org/onap/so/rest/service/HttpRestServiceProviderImpl.java b/common/common/src/main/java/org/onap/so/rest/service/HttpRestServiceProviderImpl.java similarity index 100% rename from common/src/main/java/org/onap/so/rest/service/HttpRestServiceProviderImpl.java rename to common/common/src/main/java/org/onap/so/rest/service/HttpRestServiceProviderImpl.java diff --git a/common/src/main/java/org/onap/so/security/BaseWebSecurityConfigurerAdapter.java b/common/common/src/main/java/org/onap/so/security/BaseWebSecurityConfigurerAdapter.java similarity index 100% rename from common/src/main/java/org/onap/so/security/BaseWebSecurityConfigurerAdapter.java rename to common/common/src/main/java/org/onap/so/security/BaseWebSecurityConfigurerAdapter.java diff --git a/common/src/main/java/org/onap/so/security/CorsBasicHttpSecurityConfigurer.java b/common/common/src/main/java/org/onap/so/security/CorsBasicHttpSecurityConfigurer.java similarity index 100% rename from common/src/main/java/org/onap/so/security/CorsBasicHttpSecurityConfigurer.java rename to common/common/src/main/java/org/onap/so/security/CorsBasicHttpSecurityConfigurer.java diff --git a/common/src/main/java/org/onap/so/security/CorsWebSecurityConfigurerAdapter.java b/common/common/src/main/java/org/onap/so/security/CorsWebSecurityConfigurerAdapter.java similarity index 100% rename from common/src/main/java/org/onap/so/security/CorsWebSecurityConfigurerAdapter.java rename to common/common/src/main/java/org/onap/so/security/CorsWebSecurityConfigurerAdapter.java diff --git a/common/src/main/java/org/onap/so/security/HttpHeaderForwarderConfig.java b/common/common/src/main/java/org/onap/so/security/HttpHeaderForwarderConfig.java similarity index 100% rename from common/src/main/java/org/onap/so/security/HttpHeaderForwarderConfig.java rename to common/common/src/main/java/org/onap/so/security/HttpHeaderForwarderConfig.java diff --git a/common/src/main/java/org/onap/so/security/HttpHeaderForwarderHandlerInterceptor.java b/common/common/src/main/java/org/onap/so/security/HttpHeaderForwarderHandlerInterceptor.java similarity index 100% rename from common/src/main/java/org/onap/so/security/HttpHeaderForwarderHandlerInterceptor.java rename to common/common/src/main/java/org/onap/so/security/HttpHeaderForwarderHandlerInterceptor.java diff --git a/common/src/main/java/org/onap/so/security/HttpHeaderForwarderRequestInterceptor.java b/common/common/src/main/java/org/onap/so/security/HttpHeaderForwarderRequestInterceptor.java similarity index 100% rename from common/src/main/java/org/onap/so/security/HttpHeaderForwarderRequestInterceptor.java rename to common/common/src/main/java/org/onap/so/security/HttpHeaderForwarderRequestInterceptor.java diff --git a/common/src/main/java/org/onap/so/security/HttpSecurityConfigurer.java b/common/common/src/main/java/org/onap/so/security/HttpSecurityConfigurer.java similarity index 100% rename from common/src/main/java/org/onap/so/security/HttpSecurityConfigurer.java rename to common/common/src/main/java/org/onap/so/security/HttpSecurityConfigurer.java diff --git a/common/src/main/java/org/onap/so/security/MSOSpringFirewall.java b/common/common/src/main/java/org/onap/so/security/MSOSpringFirewall.java similarity index 100% rename from common/src/main/java/org/onap/so/security/MSOSpringFirewall.java rename to common/common/src/main/java/org/onap/so/security/MSOSpringFirewall.java diff --git a/common/src/main/java/org/onap/so/security/SoBasicHttpSecurityConfigurer.java b/common/common/src/main/java/org/onap/so/security/SoBasicHttpSecurityConfigurer.java similarity index 100% rename from common/src/main/java/org/onap/so/security/SoBasicHttpSecurityConfigurer.java rename to common/common/src/main/java/org/onap/so/security/SoBasicHttpSecurityConfigurer.java diff --git a/common/src/main/java/org/onap/so/security/SoNoAuthWebSecurityConfigurerAdapter.java b/common/common/src/main/java/org/onap/so/security/SoNoAuthWebSecurityConfigurerAdapter.java similarity index 100% rename from common/src/main/java/org/onap/so/security/SoNoAuthWebSecurityConfigurerAdapter.java rename to common/common/src/main/java/org/onap/so/security/SoNoAuthWebSecurityConfigurerAdapter.java diff --git a/common/src/main/java/org/onap/so/security/SoUserCredentialConfiguration.java b/common/common/src/main/java/org/onap/so/security/SoUserCredentialConfiguration.java similarity index 100% rename from common/src/main/java/org/onap/so/security/SoUserCredentialConfiguration.java rename to common/common/src/main/java/org/onap/so/security/SoUserCredentialConfiguration.java diff --git a/common/src/main/java/org/onap/so/security/SoWebSecurityConfigurerAdapter.java b/common/common/src/main/java/org/onap/so/security/SoWebSecurityConfigurerAdapter.java similarity index 100% rename from common/src/main/java/org/onap/so/security/SoWebSecurityConfigurerAdapter.java rename to common/common/src/main/java/org/onap/so/security/SoWebSecurityConfigurerAdapter.java diff --git a/common/src/main/java/org/onap/so/security/UserCredentials.java b/common/common/src/main/java/org/onap/so/security/UserCredentials.java similarity index 100% rename from common/src/main/java/org/onap/so/security/UserCredentials.java rename to common/common/src/main/java/org/onap/so/security/UserCredentials.java diff --git a/common/src/main/java/org/onap/so/security/UserDetailsServiceImpl.java b/common/common/src/main/java/org/onap/so/security/UserDetailsServiceImpl.java similarity index 100% rename from common/src/main/java/org/onap/so/security/UserDetailsServiceImpl.java rename to common/common/src/main/java/org/onap/so/security/UserDetailsServiceImpl.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/CloudConfiguration.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/CloudConfiguration.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/CloudConfiguration.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/CloudConfiguration.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/CloudRequestData.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/CloudRequestData.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/CloudRequestData.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/CloudRequestData.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/ExceptionType.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/ExceptionType.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/ExceptionType.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/ExceptionType.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/GetOrchestrationListResponse.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/GetOrchestrationListResponse.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/GetOrchestrationListResponse.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/GetOrchestrationListResponse.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/GetOrchestrationResponse.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/GetOrchestrationResponse.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/GetOrchestrationResponse.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/GetOrchestrationResponse.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/InstanceDirection.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/InstanceDirection.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/InstanceDirection.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/InstanceDirection.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/InstanceReferences.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/InstanceReferences.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/InstanceReferences.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/InstanceReferences.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/LineOfBusiness.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/LineOfBusiness.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/LineOfBusiness.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/LineOfBusiness.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/ModelInfo.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/ModelInfo.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/ModelInfo.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/ModelInfo.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/ModelType.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/ModelType.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/ModelType.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/ModelType.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/Networks.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/Networks.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/Networks.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/Networks.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/OwningEntity.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/OwningEntity.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/OwningEntity.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/OwningEntity.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/Platform.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/Platform.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/Platform.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/Platform.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/Pnfs.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/Pnfs.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/Pnfs.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/Pnfs.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/PolicyException.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/PolicyException.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/PolicyException.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/PolicyException.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/Project.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/Project.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/Project.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/Project.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/RelatedInstance.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/RelatedInstance.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/RelatedInstance.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/RelatedInstance.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/RelatedInstanceList.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/RelatedInstanceList.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/RelatedInstanceList.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/RelatedInstanceList.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/Request.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/Request.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/Request.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/Request.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/RequestDetails.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/RequestDetails.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/RequestDetails.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/RequestDetails.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/RequestError.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/RequestError.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/RequestError.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/RequestError.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/RequestInfo.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/RequestInfo.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/RequestInfo.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/RequestInfo.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/RequestList.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/RequestList.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/RequestList.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/RequestList.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/RequestParameters.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/RequestParameters.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/RequestParameters.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/RequestParameters.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/RequestProcessingData.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/RequestProcessingData.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/RequestProcessingData.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/RequestProcessingData.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/RequestReferences.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/RequestReferences.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/RequestReferences.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/RequestReferences.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/RequestStatus.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/RequestStatus.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/RequestStatus.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/RequestStatus.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/Resources.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/Resources.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/Resources.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/Resources.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/Service.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/Service.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/Service.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/Service.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/ServiceException.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/ServiceException.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/ServiceException.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/ServiceException.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/ServiceInstancesRequest.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/ServiceInstancesRequest.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/ServiceInstancesRequest.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/ServiceInstancesRequest.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/ServiceInstancesResponse.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/ServiceInstancesResponse.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/ServiceInstancesResponse.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/ServiceInstancesResponse.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/SubscriberInfo.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/SubscriberInfo.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/SubscriberInfo.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/SubscriberInfo.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/VfModules.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/VfModules.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/VfModules.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/VfModules.java diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/Vnfs.java b/common/common/src/main/java/org/onap/so/serviceinstancebeans/Vnfs.java similarity index 100% rename from common/src/main/java/org/onap/so/serviceinstancebeans/Vnfs.java rename to common/common/src/main/java/org/onap/so/serviceinstancebeans/Vnfs.java diff --git a/common/src/main/java/org/onap/so/spring/SpringContextHelper.java b/common/common/src/main/java/org/onap/so/spring/SpringContextHelper.java similarity index 100% rename from common/src/main/java/org/onap/so/spring/SpringContextHelper.java rename to common/common/src/main/java/org/onap/so/spring/SpringContextHelper.java diff --git a/common/src/main/java/org/onap/so/test/categories/SlowTests.java b/common/common/src/main/java/org/onap/so/test/categories/SlowTests.java similarity index 100% rename from common/src/main/java/org/onap/so/test/categories/SlowTests.java rename to common/common/src/main/java/org/onap/so/test/categories/SlowTests.java diff --git a/common/src/main/java/org/onap/so/utils/CheckResults.java b/common/common/src/main/java/org/onap/so/utils/CheckResults.java similarity index 100% rename from common/src/main/java/org/onap/so/utils/CheckResults.java rename to common/common/src/main/java/org/onap/so/utils/CheckResults.java diff --git a/common/src/main/java/org/onap/so/utils/Components.java b/common/common/src/main/java/org/onap/so/utils/Components.java similarity index 100% rename from common/src/main/java/org/onap/so/utils/Components.java rename to common/common/src/main/java/org/onap/so/utils/Components.java diff --git a/common/src/main/java/org/onap/so/utils/CryptoUtils.java b/common/common/src/main/java/org/onap/so/utils/CryptoUtils.java similarity index 100% rename from common/src/main/java/org/onap/so/utils/CryptoUtils.java rename to common/common/src/main/java/org/onap/so/utils/CryptoUtils.java diff --git a/common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java b/common/common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java similarity index 100% rename from common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java rename to common/common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java diff --git a/common/src/main/java/org/onap/so/utils/ExternalTaskUtils.java b/common/common/src/main/java/org/onap/so/utils/ExternalTaskUtils.java similarity index 100% rename from common/src/main/java/org/onap/so/utils/ExternalTaskUtils.java rename to common/common/src/main/java/org/onap/so/utils/ExternalTaskUtils.java diff --git a/common/src/main/java/org/onap/so/utils/RetrySequenceLevel.java b/common/common/src/main/java/org/onap/so/utils/RetrySequenceLevel.java similarity index 100% rename from common/src/main/java/org/onap/so/utils/RetrySequenceLevel.java rename to common/common/src/main/java/org/onap/so/utils/RetrySequenceLevel.java diff --git a/common/src/main/java/org/onap/so/utils/UUIDChecker.java b/common/common/src/main/java/org/onap/so/utils/UUIDChecker.java similarity index 100% rename from common/src/main/java/org/onap/so/utils/UUIDChecker.java rename to common/common/src/main/java/org/onap/so/utils/UUIDChecker.java diff --git a/common/src/main/java/org/onap/so/utils/XmlMarshaller.java b/common/common/src/main/java/org/onap/so/utils/XmlMarshaller.java similarity index 100% rename from common/src/main/java/org/onap/so/utils/XmlMarshaller.java rename to common/common/src/main/java/org/onap/so/utils/XmlMarshaller.java diff --git a/common/src/main/java/org/onap/so/web/exceptions/ExceptionResponse.java b/common/common/src/main/java/org/onap/so/web/exceptions/ExceptionResponse.java similarity index 100% rename from common/src/main/java/org/onap/so/web/exceptions/ExceptionResponse.java rename to common/common/src/main/java/org/onap/so/web/exceptions/ExceptionResponse.java diff --git a/common/src/main/java/org/onap/so/web/exceptions/RuntimeExceptionMapper.java b/common/common/src/main/java/org/onap/so/web/exceptions/RuntimeExceptionMapper.java similarity index 100% rename from common/src/main/java/org/onap/so/web/exceptions/RuntimeExceptionMapper.java rename to common/common/src/main/java/org/onap/so/web/exceptions/RuntimeExceptionMapper.java diff --git a/common/src/main/resources/ASDC.properties b/common/common/src/main/resources/ASDC.properties similarity index 100% rename from common/src/main/resources/ASDC.properties rename to common/common/src/main/resources/ASDC.properties diff --git a/common/src/main/resources/ApiHandler.properties b/common/common/src/main/resources/ApiHandler.properties similarity index 100% rename from common/src/main/resources/ApiHandler.properties rename to common/common/src/main/resources/ApiHandler.properties diff --git a/common/src/main/resources/BPMN.properties b/common/common/src/main/resources/BPMN.properties similarity index 100% rename from common/src/main/resources/BPMN.properties rename to common/common/src/main/resources/BPMN.properties diff --git a/common/src/main/resources/GenericMessages.properties b/common/common/src/main/resources/GenericMessages.properties similarity index 100% rename from common/src/main/resources/GenericMessages.properties rename to common/common/src/main/resources/GenericMessages.properties diff --git a/common/src/main/resources/Policy.properties b/common/common/src/main/resources/Policy.properties similarity index 100% rename from common/src/main/resources/Policy.properties rename to common/common/src/main/resources/Policy.properties diff --git a/common/src/main/resources/ResourceAdapter.properties b/common/common/src/main/resources/ResourceAdapter.properties similarity index 100% rename from common/src/main/resources/ResourceAdapter.properties rename to common/common/src/main/resources/ResourceAdapter.properties diff --git a/common/src/main/resources/dmaap/default-consumer.properties b/common/common/src/main/resources/dmaap/default-consumer.properties similarity index 100% rename from common/src/main/resources/dmaap/default-consumer.properties rename to common/common/src/main/resources/dmaap/default-consumer.properties diff --git a/common/src/main/resources/dmaap/default-publisher.properties b/common/common/src/main/resources/dmaap/default-publisher.properties similarity index 100% rename from common/src/main/resources/dmaap/default-publisher.properties rename to common/common/src/main/resources/dmaap/default-publisher.properties diff --git a/common/src/main/resources/dmaap/empty.txt b/common/common/src/main/resources/dmaap/empty.txt similarity index 100% rename from common/src/main/resources/dmaap/empty.txt rename to common/common/src/main/resources/dmaap/empty.txt diff --git a/common/src/main/resources/kafka/default-consumer.properties b/common/common/src/main/resources/kafka/default-consumer.properties similarity index 100% rename from common/src/main/resources/kafka/default-consumer.properties rename to common/common/src/main/resources/kafka/default-consumer.properties diff --git a/common/src/main/resources/test b/common/common/src/main/resources/test similarity index 100% rename from common/src/main/resources/test rename to common/common/src/main/resources/test diff --git a/common/src/test/java/org/onap/so/BeansTest.java b/common/common/src/test/java/org/onap/so/BeansTest.java similarity index 100% rename from common/src/test/java/org/onap/so/BeansTest.java rename to common/common/src/test/java/org/onap/so/BeansTest.java diff --git a/common/src/test/java/org/onap/so/NonSpringSuite.java b/common/common/src/test/java/org/onap/so/NonSpringSuite.java similarity index 100% rename from common/src/test/java/org/onap/so/NonSpringSuite.java rename to common/common/src/test/java/org/onap/so/NonSpringSuite.java diff --git a/common/src/test/java/org/onap/so/SpringSuite.java b/common/common/src/test/java/org/onap/so/SpringSuite.java similarity index 100% rename from common/src/test/java/org/onap/so/SpringSuite.java rename to common/common/src/test/java/org/onap/so/SpringSuite.java diff --git a/common/src/test/java/org/onap/so/TestApp.java b/common/common/src/test/java/org/onap/so/TestApp.java similarity index 100% rename from common/src/test/java/org/onap/so/TestApp.java rename to common/common/src/test/java/org/onap/so/TestApp.java diff --git a/common/src/test/java/org/onap/so/adapter_utils/tests/CryptoTest.java b/common/common/src/test/java/org/onap/so/adapter_utils/tests/CryptoTest.java similarity index 100% rename from common/src/test/java/org/onap/so/adapter_utils/tests/CryptoTest.java rename to common/common/src/test/java/org/onap/so/adapter_utils/tests/CryptoTest.java diff --git a/common/src/test/java/org/onap/so/client/HttpClientTest.java b/common/common/src/test/java/org/onap/so/client/HttpClientTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/HttpClientTest.java rename to common/common/src/test/java/org/onap/so/client/HttpClientTest.java diff --git a/common/src/test/java/org/onap/so/client/RestClientTest.java b/common/common/src/test/java/org/onap/so/client/RestClientTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/RestClientTest.java rename to common/common/src/test/java/org/onap/so/client/RestClientTest.java diff --git a/common/src/test/java/org/onap/so/client/adapter/rest/AdapterRestClientTest.java b/common/common/src/test/java/org/onap/so/client/adapter/rest/AdapterRestClientTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/adapter/rest/AdapterRestClientTest.java rename to common/common/src/test/java/org/onap/so/client/adapter/rest/AdapterRestClientTest.java diff --git a/common/src/test/java/org/onap/so/client/cds/CDSProcessingClientTest.java b/common/common/src/test/java/org/onap/so/client/cds/CDSProcessingClientTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/cds/CDSProcessingClientTest.java rename to common/common/src/test/java/org/onap/so/client/cds/CDSProcessingClientTest.java diff --git a/common/src/test/java/org/onap/so/client/cds/TestCDSProcessingListener.java b/common/common/src/test/java/org/onap/so/client/cds/TestCDSProcessingListener.java similarity index 100% rename from common/src/test/java/org/onap/so/client/cds/TestCDSProcessingListener.java rename to common/common/src/test/java/org/onap/so/client/cds/TestCDSProcessingListener.java diff --git a/common/src/test/java/org/onap/so/client/cds/TestCDSPropertiesImpl.java b/common/common/src/test/java/org/onap/so/client/cds/TestCDSPropertiesImpl.java similarity index 100% rename from common/src/test/java/org/onap/so/client/cds/TestCDSPropertiesImpl.java rename to common/common/src/test/java/org/onap/so/client/cds/TestCDSPropertiesImpl.java diff --git a/common/src/test/java/org/onap/so/client/dmaap/DmaapClientTest.java b/common/common/src/test/java/org/onap/so/client/dmaap/DmaapClientTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/dmaap/DmaapClientTest.java rename to common/common/src/test/java/org/onap/so/client/dmaap/DmaapClientTest.java diff --git a/common/src/test/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailureTest.java b/common/common/src/test/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailureTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailureTest.java rename to common/common/src/test/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailureTest.java diff --git a/common/src/test/java/org/onap/so/client/dmaap/rest/DMaaPRestClientTest.java b/common/common/src/test/java/org/onap/so/client/dmaap/rest/DMaaPRestClientTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/dmaap/rest/DMaaPRestClientTest.java rename to common/common/src/test/java/org/onap/so/client/dmaap/rest/DMaaPRestClientTest.java diff --git a/common/src/test/java/org/onap/so/client/grm/GRMBeansTest.java b/common/common/src/test/java/org/onap/so/client/grm/GRMBeansTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/grm/GRMBeansTest.java rename to common/common/src/test/java/org/onap/so/client/grm/GRMBeansTest.java diff --git a/common/src/test/java/org/onap/so/client/grm/ServiceEndPointListTest.java b/common/common/src/test/java/org/onap/so/client/grm/ServiceEndPointListTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/grm/ServiceEndPointListTest.java rename to common/common/src/test/java/org/onap/so/client/grm/ServiceEndPointListTest.java diff --git a/common/src/test/java/org/onap/so/client/grm/ServiceEndPointRequestTest.java b/common/common/src/test/java/org/onap/so/client/grm/ServiceEndPointRequestTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/grm/ServiceEndPointRequestTest.java rename to common/common/src/test/java/org/onap/so/client/grm/ServiceEndPointRequestTest.java diff --git a/common/src/test/java/org/onap/so/client/grm/exception/GRMClientCallFailedTest.java b/common/common/src/test/java/org/onap/so/client/grm/exception/GRMClientCallFailedTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/grm/exception/GRMClientCallFailedTest.java rename to common/common/src/test/java/org/onap/so/client/grm/exception/GRMClientCallFailedTest.java diff --git a/common/src/test/java/org/onap/so/client/kafka/KafkaConsumerImplTest.java b/common/common/src/test/java/org/onap/so/client/kafka/KafkaConsumerImplTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/kafka/KafkaConsumerImplTest.java rename to common/common/src/test/java/org/onap/so/client/kafka/KafkaConsumerImplTest.java diff --git a/common/src/test/java/org/onap/so/client/policy/PolicyClientImplTest.java b/common/common/src/test/java/org/onap/so/client/policy/PolicyClientImplTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/policy/PolicyClientImplTest.java rename to common/common/src/test/java/org/onap/so/client/policy/PolicyClientImplTest.java diff --git a/common/src/test/java/org/onap/so/client/policy/entities/PolicyEntitiesTest.java b/common/common/src/test/java/org/onap/so/client/policy/entities/PolicyEntitiesTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/policy/entities/PolicyEntitiesTest.java rename to common/common/src/test/java/org/onap/so/client/policy/entities/PolicyEntitiesTest.java diff --git a/common/src/test/java/org/onap/so/client/sdno/beans/SdnoBeansTest.java b/common/common/src/test/java/org/onap/so/client/sdno/beans/SdnoBeansTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/sdno/beans/SdnoBeansTest.java rename to common/common/src/test/java/org/onap/so/client/sdno/beans/SdnoBeansTest.java diff --git a/common/src/test/java/org/onap/so/configuration/rest/BasicHttpHeadersProviderTest.java b/common/common/src/test/java/org/onap/so/configuration/rest/BasicHttpHeadersProviderTest.java similarity index 100% rename from common/src/test/java/org/onap/so/configuration/rest/BasicHttpHeadersProviderTest.java rename to common/common/src/test/java/org/onap/so/configuration/rest/BasicHttpHeadersProviderTest.java diff --git a/common/src/test/java/org/onap/so/configuration/rest/HttpComponentsClientConfigurationTest.java b/common/common/src/test/java/org/onap/so/configuration/rest/HttpComponentsClientConfigurationTest.java similarity index 100% rename from common/src/test/java/org/onap/so/configuration/rest/HttpComponentsClientConfigurationTest.java rename to common/common/src/test/java/org/onap/so/configuration/rest/HttpComponentsClientConfigurationTest.java diff --git a/common/src/test/java/org/onap/so/constants/DefaultsTest.java b/common/common/src/test/java/org/onap/so/constants/DefaultsTest.java similarity index 100% rename from common/src/test/java/org/onap/so/constants/DefaultsTest.java rename to common/common/src/test/java/org/onap/so/constants/DefaultsTest.java diff --git a/common/src/test/java/org/onap/so/db/connections/DbDnsIpAddressTest.java b/common/common/src/test/java/org/onap/so/db/connections/DbDnsIpAddressTest.java similarity index 100% rename from common/src/test/java/org/onap/so/db/connections/DbDnsIpAddressTest.java rename to common/common/src/test/java/org/onap/so/db/connections/DbDnsIpAddressTest.java diff --git a/common/src/test/java/org/onap/so/entity/MsoRequestTest.java b/common/common/src/test/java/org/onap/so/entity/MsoRequestTest.java similarity index 100% rename from common/src/test/java/org/onap/so/entity/MsoRequestTest.java rename to common/common/src/test/java/org/onap/so/entity/MsoRequestTest.java diff --git a/common/src/test/java/org/onap/so/exceptions/ValidationExceptionTest.java b/common/common/src/test/java/org/onap/so/exceptions/ValidationExceptionTest.java similarity index 100% rename from common/src/test/java/org/onap/so/exceptions/ValidationExceptionTest.java rename to common/common/src/test/java/org/onap/so/exceptions/ValidationExceptionTest.java diff --git a/common/src/test/java/org/onap/so/jsonpath/JsonPathUtilTest.java b/common/common/src/test/java/org/onap/so/jsonpath/JsonPathUtilTest.java similarity index 100% rename from common/src/test/java/org/onap/so/jsonpath/JsonPathUtilTest.java rename to common/common/src/test/java/org/onap/so/jsonpath/JsonPathUtilTest.java diff --git a/common/src/test/java/org/onap/so/logging/MaskLogStatementsTest.java b/common/common/src/test/java/org/onap/so/logging/MaskLogStatementsTest.java similarity index 100% rename from common/src/test/java/org/onap/so/logging/MaskLogStatementsTest.java rename to common/common/src/test/java/org/onap/so/logging/MaskLogStatementsTest.java diff --git a/common/src/test/java/org/onap/so/logging/tasks/MDCSetupTest.java b/common/common/src/test/java/org/onap/so/logging/tasks/MDCSetupTest.java similarity index 100% rename from common/src/test/java/org/onap/so/logging/tasks/MDCSetupTest.java rename to common/common/src/test/java/org/onap/so/logging/tasks/MDCSetupTest.java diff --git a/common/src/test/java/org/onap/so/rest/service/HttpRestServiceProviderImplTest.java b/common/common/src/test/java/org/onap/so/rest/service/HttpRestServiceProviderImplTest.java similarity index 100% rename from common/src/test/java/org/onap/so/rest/service/HttpRestServiceProviderImplTest.java rename to common/common/src/test/java/org/onap/so/rest/service/HttpRestServiceProviderImplTest.java diff --git a/common/src/test/java/org/onap/so/security/AuthenticationTest.java b/common/common/src/test/java/org/onap/so/security/AuthenticationTest.java similarity index 100% rename from common/src/test/java/org/onap/so/security/AuthenticationTest.java rename to common/common/src/test/java/org/onap/so/security/AuthenticationTest.java diff --git a/common/src/test/java/org/onap/so/security/UserDetailsServiceImplTest.java b/common/common/src/test/java/org/onap/so/security/UserDetailsServiceImplTest.java similarity index 100% rename from common/src/test/java/org/onap/so/security/UserDetailsServiceImplTest.java rename to common/common/src/test/java/org/onap/so/security/UserDetailsServiceImplTest.java diff --git a/common/src/test/java/org/onap/so/serviceinstancebeans/ModelTypeTest.java b/common/common/src/test/java/org/onap/so/serviceinstancebeans/ModelTypeTest.java similarity index 100% rename from common/src/test/java/org/onap/so/serviceinstancebeans/ModelTypeTest.java rename to common/common/src/test/java/org/onap/so/serviceinstancebeans/ModelTypeTest.java diff --git a/common/src/test/java/org/onap/so/serviceinstancebeans/RequestStatusTest.java b/common/common/src/test/java/org/onap/so/serviceinstancebeans/RequestStatusTest.java similarity index 100% rename from common/src/test/java/org/onap/so/serviceinstancebeans/RequestStatusTest.java rename to common/common/src/test/java/org/onap/so/serviceinstancebeans/RequestStatusTest.java diff --git a/common/src/test/java/org/onap/so/serviceinstancebeans/ServiceInstanceBeansTest.java b/common/common/src/test/java/org/onap/so/serviceinstancebeans/ServiceInstanceBeansTest.java similarity index 100% rename from common/src/test/java/org/onap/so/serviceinstancebeans/ServiceInstanceBeansTest.java rename to common/common/src/test/java/org/onap/so/serviceinstancebeans/ServiceInstanceBeansTest.java diff --git a/common/src/test/java/org/onap/so/serviceinstancebeans/ServiceInstancesRequestTest.java b/common/common/src/test/java/org/onap/so/serviceinstancebeans/ServiceInstancesRequestTest.java similarity index 100% rename from common/src/test/java/org/onap/so/serviceinstancebeans/ServiceInstancesRequestTest.java rename to common/common/src/test/java/org/onap/so/serviceinstancebeans/ServiceInstancesRequestTest.java diff --git a/common/src/test/java/org/onap/so/serviceinstancebeans/TestServiceInstanceBean.java b/common/common/src/test/java/org/onap/so/serviceinstancebeans/TestServiceInstanceBean.java similarity index 100% rename from common/src/test/java/org/onap/so/serviceinstancebeans/TestServiceInstanceBean.java rename to common/common/src/test/java/org/onap/so/serviceinstancebeans/TestServiceInstanceBean.java diff --git a/common/src/test/java/org/onap/so/test/categories/SpringAware.java b/common/common/src/test/java/org/onap/so/test/categories/SpringAware.java similarity index 100% rename from common/src/test/java/org/onap/so/test/categories/SpringAware.java rename to common/common/src/test/java/org/onap/so/test/categories/SpringAware.java diff --git a/common/src/test/java/org/onap/so/utils/CheckResultsTest.java b/common/common/src/test/java/org/onap/so/utils/CheckResultsTest.java similarity index 100% rename from common/src/test/java/org/onap/so/utils/CheckResultsTest.java rename to common/common/src/test/java/org/onap/so/utils/CheckResultsTest.java diff --git a/common/src/test/java/org/onap/so/utils/ExternalTaskServiceUtilsTest.java b/common/common/src/test/java/org/onap/so/utils/ExternalTaskServiceUtilsTest.java similarity index 100% rename from common/src/test/java/org/onap/so/utils/ExternalTaskServiceUtilsTest.java rename to common/common/src/test/java/org/onap/so/utils/ExternalTaskServiceUtilsTest.java diff --git a/common/src/test/java/org/onap/so/utils/ExternalTaskUtilsTest.java b/common/common/src/test/java/org/onap/so/utils/ExternalTaskUtilsTest.java similarity index 100% rename from common/src/test/java/org/onap/so/utils/ExternalTaskUtilsTest.java rename to common/common/src/test/java/org/onap/so/utils/ExternalTaskUtilsTest.java diff --git a/common/src/test/java/org/onap/so/utils/TestAppender.java b/common/common/src/test/java/org/onap/so/utils/TestAppender.java similarity index 100% rename from common/src/test/java/org/onap/so/utils/TestAppender.java rename to common/common/src/test/java/org/onap/so/utils/TestAppender.java diff --git a/common/src/test/java/org/onap/so/utils/UUIDCheckerTest.java b/common/common/src/test/java/org/onap/so/utils/UUIDCheckerTest.java similarity index 100% rename from common/src/test/java/org/onap/so/utils/UUIDCheckerTest.java rename to common/common/src/test/java/org/onap/so/utils/UUIDCheckerTest.java diff --git a/common/src/test/java/org/onap/so/utils/XMLMarshallerTest.java b/common/common/src/test/java/org/onap/so/utils/XMLMarshallerTest.java similarity index 100% rename from common/src/test/java/org/onap/so/utils/XMLMarshallerTest.java rename to common/common/src/test/java/org/onap/so/utils/XMLMarshallerTest.java diff --git a/common/src/test/java/org/onap/so/web/exceptions/RuntimeExceptionMapperTest.java b/common/common/src/test/java/org/onap/so/web/exceptions/RuntimeExceptionMapperTest.java similarity index 100% rename from common/src/test/java/org/onap/so/web/exceptions/RuntimeExceptionMapperTest.java rename to common/common/src/test/java/org/onap/so/web/exceptions/RuntimeExceptionMapperTest.java diff --git a/common/src/test/resources/META-INF/services/org.onap.so.client.RestProperties b/common/common/src/test/resources/META-INF/services/org.onap.so.client.RestProperties similarity index 100% rename from common/src/test/resources/META-INF/services/org.onap.so.client.RestProperties rename to common/common/src/test/resources/META-INF/services/org.onap.so.client.RestProperties diff --git a/common/src/test/resources/__files/Policy/configJson.json b/common/common/src/test/resources/__files/Policy/configJson.json similarity index 100% rename from common/src/test/resources/__files/Policy/configJson.json rename to common/common/src/test/resources/__files/Policy/configJson.json diff --git a/common/src/test/resources/__files/Policy/policyAbortResponse.json b/common/common/src/test/resources/__files/Policy/policyAbortResponse.json similarity index 100% rename from common/src/test/resources/__files/Policy/policyAbortResponse.json rename to common/common/src/test/resources/__files/Policy/policyAbortResponse.json diff --git a/common/src/test/resources/__files/Policy/policyConfig.json b/common/common/src/test/resources/__files/Policy/policyConfig.json similarity index 100% rename from common/src/test/resources/__files/Policy/policyConfig.json rename to common/common/src/test/resources/__files/Policy/policyConfig.json diff --git a/common/src/test/resources/__files/Policy/policySkipResponse.json b/common/common/src/test/resources/__files/Policy/policySkipResponse.json similarity index 100% rename from common/src/test/resources/__files/Policy/policySkipResponse.json rename to common/common/src/test/resources/__files/Policy/policySkipResponse.json diff --git a/common/src/test/resources/__files/grm/endpoints.json b/common/common/src/test/resources/__files/grm/endpoints.json similarity index 100% rename from common/src/test/resources/__files/grm/endpoints.json rename to common/common/src/test/resources/__files/grm/endpoints.json diff --git a/common/src/test/resources/__files/grm/endpoints2.json b/common/common/src/test/resources/__files/grm/endpoints2.json similarity index 100% rename from common/src/test/resources/__files/grm/endpoints2.json rename to common/common/src/test/resources/__files/grm/endpoints2.json diff --git a/common/src/test/resources/__files/logging/openstack-payload.json b/common/common/src/test/resources/__files/logging/openstack-payload.json similarity index 100% rename from common/src/test/resources/__files/logging/openstack-payload.json rename to common/common/src/test/resources/__files/logging/openstack-payload.json diff --git a/common/src/test/resources/application-test.yaml b/common/common/src/test/resources/application-test.yaml similarity index 100% rename from common/src/test/resources/application-test.yaml rename to common/common/src/test/resources/application-test.yaml diff --git a/common/src/test/resources/dmaap.properties b/common/common/src/test/resources/dmaap.properties similarity index 100% rename from common/src/test/resources/dmaap.properties rename to common/common/src/test/resources/dmaap.properties diff --git a/common/src/test/resources/logback-test.xml b/common/common/src/test/resources/logback-test.xml similarity index 100% rename from common/src/test/resources/logback-test.xml rename to common/common/src/test/resources/logback-test.xml diff --git a/common/src/test/resources/mso.nrdp-alarms.properties b/common/common/src/test/resources/mso.nrdp-alarms.properties similarity index 100% rename from common/src/test/resources/mso.nrdp-alarms.properties rename to common/common/src/test/resources/mso.nrdp-alarms.properties diff --git a/common/src/test/resources/policy.properties b/common/common/src/test/resources/policy.properties similarity index 100% rename from common/src/test/resources/policy.properties rename to common/common/src/test/resources/policy.properties diff --git a/common/pom.xml b/common/pom.xml index 894bb15f47..871c952956 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -1,4 +1,3 @@ - 4.0.0 @@ -8,361 +7,8 @@ 1.16.0-SNAPSHOT common - common - MSO Common classes:- Logger - - 3.22.2 - 4.1.30.Final - 1.1.5 - 9.0.105 - 1.2.13 - - - - org.apache.httpcomponents - httpclient - - - org.springframework - spring-aspects - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-actuator - - - com.jayway.jsonpath - json-path - 2.5.0 - - - org.hibernate - hibernate-core - - - org.springframework - spring-web - - - org.springframework - spring-webmvc - - - org.modelmapper - modelmapper - 2.3.2 - - - org.apache.cxf - cxf-rt-rs-client - test - - - com.shazam - shazamcrest - 0.11 - test - - - com.google.guava - guava - - - org.apache.commons - commons-lang3 - - - com.vaadin.external.google - android-json - - - - - org.apache.tomcat - tomcat-catalina - ${tomcat-catalina-version} - - - org.slf4j - slf4j-ext - - - org.slf4j - slf4j-api - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.springframework.retry - spring-retry - - - net.jodah - failsafe - 2.0.1 - - - org.mockito - mockito-core - test - - - org.json - json - - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - junit-vintage-engine - test - - - org.reflections - reflections - 0.9.11 - - - com.zaxxer - HikariCP - - - - org.onap.ccsdk.cds.blueprintsprocessor.modules - blueprint-proto - ${ccsdk.version} - - - io.springfox - springfox-boot-starter - - - org.apache.kafka - kafka-clients - - - - - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - - - io.grpc - grpc-protobuf - ${grpc.version} - - - com.google.code.findbugs - jsr305 - - - - - io.grpc - grpc-netty - ${grpc.version} - - - io.grpc - grpc-testing - ${grpc.version} - test - - - org.javatuples - javatuples - 1.2 - - - org.camunda.bpm - camunda-external-task-client - - - org.onap.appc.client - client-lib - ${appc.client.version} - - - org.mockito - mockito-core - - - org.powermock - powermock-module-junit4 - - - org.powermock - powermock-api-mockito - - - - - org.onap.appc.client - client-kit - ${appc.client.version} - - - org.mockito - mockito-core - - - - - org.projectlombok - lombok - provided - - - javax.validation - validation-api - - - com.sun.xml.bind - jaxb-core - 2.3.0 - - - com.sun.xml.bind - jaxb-impl - 2.3.0 - - - javax.cache - cache-api - 1.1.0 - - - org.springframework.cloud - spring-cloud-starter-sleuth - - - - org.apache.kafka - kafka-clients - ${kafka-clients.version} - - - uk.org.webcompere - system-stubs-jupiter - 1.1.0 - test - - - org.junit.jupiter - junit-jupiter-engine - - - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - ch.qos.logback - logback-core - ${logback.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - - - - - src/main/resources - true - - - src/main/java - - **/*.java - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - default-test - - test - - - - **/NonSpringSuite.java - - - - - spring-tests - - test - - - - **/SpringSuite.java - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - tests-jar - package - - test-jar - - - false - - - - - - - - - maven-surefire-plugin - 3.1.2 - - - DEBUG - - 2 - suites - false - 1 - ${surefireArgLine} - - - - - + pom + + common + diff --git a/graph-inventory/aai-client/pom.xml b/graph-inventory/aai-client/pom.xml index 6edfde2f39..dfa1a1d2e5 100644 --- a/graph-inventory/aai-client/pom.xml +++ b/graph-inventory/aai-client/pom.xml @@ -14,7 +14,7 @@ ${project.version} - org.onap.so + org.onap.so.common common ${project.version} diff --git a/mso-api-handlers/mso-requests-db/pom.xml b/mso-api-handlers/mso-requests-db/pom.xml index ad8d30272e..3054fae865 100644 --- a/mso-api-handlers/mso-requests-db/pom.xml +++ b/mso-api-handlers/mso-requests-db/pom.xml @@ -15,7 +15,7 @@ - org.onap.so + org.onap.so.common common ${project.version} diff --git a/mso-catalog-db/pom.xml b/mso-catalog-db/pom.xml index 46f131fe35..0212c7a5b3 100644 --- a/mso-catalog-db/pom.xml +++ b/mso-catalog-db/pom.xml @@ -43,7 +43,7 @@ ${bowman.client.version} - org.onap.so + org.onap.so.common common ${project.version} diff --git a/so-optimization-clients/pom.xml b/so-optimization-clients/pom.xml index d39344c1fb..d805bb92f3 100644 --- a/so-optimization-clients/pom.xml +++ b/so-optimization-clients/pom.xml @@ -81,7 +81,7 @@ true - org.onap.so + org.onap.so.common common ${project.version} diff --git a/so-sdn-clients/pom.xml b/so-sdn-clients/pom.xml index 3967b03b11..e13981fe18 100644 --- a/so-sdn-clients/pom.xml +++ b/so-sdn-clients/pom.xml @@ -126,7 +126,7 @@ test - org.onap.so + org.onap.so.common common ${project.version}