16 files changed, 49 insertions, 13 deletions
diff --git a/deployment/pom.xml b/deployment/pom.xml
index b6f32c4f..a3191a78 100644
--- a/deployment/pom.xml
+++ b/deployment/pom.xml
@@ -79,6 +79,8 @@
                                 "${project.build.directory}/../../main/target/cli-main-${project.version}.jar")
                                 fileset(dir:
                                 "${project.build.directory}/../../main/target/lib/")
+                                fileset(dir:
+                                "${project.build.directory}/../../plugins/target/lib/")
                                 }
 
                                 ant.zip(destfile:
@@ -94,7 +96,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-				<version>3.0.0</version>
+                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <id>attach-artifacts</id>
diff --git a/main/pom.xml b/main/pom.xml
index d1bc138c..451c55df 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -43,11 +43,6 @@
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.cli</groupId>
-            <artifactId>cli-plugin-common-service</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>1.3.2</version>
diff --git a/plugins/common-service/pom.xml b/plugins/msb/pom.xml
index 0ca644ed..18a76f87 100644
--- a/plugins/common-service/pom.xml
+++ b/plugins/msb/pom.xml
@@ -27,7 +27,15 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>cli-plugin-common-service</artifactId>
-    <name>cli/plugins/common-service</name>
+    <artifactId>cli-plugins-msb</artifactId>
+    <name>cli/plugins/msb</name>
     <packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/plugins/common-service/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceCreateCommand.java b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceCreateCommand.java
index 8b46e6b8..8b46e6b8 100644
--- a/plugins/common-service/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceCreateCommand.java
+++ b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceCreateCommand.java
diff --git a/plugins/common-service/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceDeleteCommand.java b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceDeleteCommand.java
index 595934d9..595934d9 100644
--- a/plugins/common-service/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceDeleteCommand.java
+++ b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceDeleteCommand.java
diff --git a/plugins/common-service/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceListCommand.java b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceListCommand.java
index 436d187b..436d187b 100644
--- a/plugins/common-service/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceListCommand.java
+++ b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceListCommand.java
diff --git a/plugins/common-service/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceShowCommand.java b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceShowCommand.java
index 2256cc61..2256cc61 100644
--- a/plugins/common-service/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceShowCommand.java
+++ b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceShowCommand.java
diff --git a/plugins/common-service/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand b/plugins/msb/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand
index 527abe0c..527abe0c 100644
--- a/plugins/common-service/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand
+++ b/plugins/msb/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand
diff --git a/plugins/common-service/src/main/resources/microservice-create-schema.yaml b/plugins/msb/src/main/resources/microservice-create-schema.yaml
index 13bd53b1..13bd53b1 100644
--- a/plugins/common-service/src/main/resources/microservice-create-schema.yaml
+++ b/plugins/msb/src/main/resources/microservice-create-schema.yaml
diff --git a/plugins/common-service/src/main/resources/microservice-delete-schema.yaml b/plugins/msb/src/main/resources/microservice-delete-schema.yaml
index 695efe1e..695efe1e 100644
--- a/plugins/common-service/src/main/resources/microservice-delete-schema.yaml
+++ b/plugins/msb/src/main/resources/microservice-delete-schema.yaml
diff --git a/plugins/common-service/src/main/resources/microservice-list-schema.yaml b/plugins/msb/src/main/resources/microservice-list-schema.yaml
index 79dca5b1..79dca5b1 100644
--- a/plugins/common-service/src/main/resources/microservice-list-schema.yaml
+++ b/plugins/msb/src/main/resources/microservice-list-schema.yaml
diff --git a/plugins/common-service/src/main/resources/microservice-show-schema.yaml b/plugins/msb/src/main/resources/microservice-show-schema.yaml
index 47e33c6a..47e33c6a 100644
--- a/plugins/common-service/src/main/resources/microservice-show-schema.yaml
+++ b/plugins/msb/src/main/resources/microservice-show-schema.yaml
diff --git a/plugins/common-service/src/test/resources/service-list-schema.yaml b/plugins/msb/src/test/resources/service-list-schema.yaml
index 72e774b8..72e774b8 100644
--- a/plugins/common-service/src/test/resources/service-list-schema.yaml
+++ b/plugins/msb/src/test/resources/service-list-schema.yaml
diff --git a/plugins/common-service/src/test/resources/user-create-schema.yaml b/plugins/msb/src/test/resources/user-create-schema.yaml
index 3f1e8866..3f1e8866 100644
--- a/plugins/common-service/src/test/resources/user-create-schema.yaml
+++ b/plugins/msb/src/test/resources/user-create-schema.yaml
diff --git a/plugins/pom.xml b/plugins/pom.xml
index ecccc79e..93ac3b0f 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -40,10 +40,41 @@
         <dependency>
             <groupId>org.onap.cli</groupId>
             <artifactId>cli-framework</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>${project.parent.version}</version>
         </dependency>
     </dependencies>
     <modules>
-        <module>common-service</module>
+        <module>msb</module>
     </modules>
+     <build>
+         <pluginManagement>
+            <plugins>
+                <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-dependency-plugin</artifactId>
+                  <executions>
+                    <execution>
+                      <id>copy-artifact</id>
+                      <phase>package</phase>
+                      <goals>
+                        <goal>copy</goal>
+                      </goals>
+                      <configuration>
+                        <artifactItems>
+                            <artifactItem>
+                              <groupId>${project.groupId}</groupId>
+                              <artifactId>${project.artifactId}</artifactId>
+                              <version>${project.version}</version>
+                              <type>${project.packaging}</type>
+                            </artifactItem>
+                        </artifactItems>
+                        <!-- copy to plugin dependencies -->
+                        <outputDirectory>../../plugins/target/lib</outputDirectory>
+                      </configuration>
+                    </execution>
+                  </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 </project>
diff --git a/pom.xml b/pom.xml
index 162b0924..cc361731 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,13 +16,13 @@
  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-	
+
     <parent>
       <groupId>org.onap.oparent</groupId>
       <artifactId>oparent</artifactId>
-      <version>1.0.0-SNAPSHOT</version>    
+      <version>1.0.0-SNAPSHOT</version>
     </parent>
-  
+
     <groupId>org.onap.cli</groupId>
     <artifactId>cli</artifactId>
     <packaging>pom</packaging>