Clean up installer

Clean up installers to install only ONAP code, not third party
dependencies.  Third party dependencies should be installed
in ccsdk/distribution/dependencies only.

Change-Id: Icd7b7d34d1f0b5c07b8f0badd28e33330e518774
Issue-ID: CCSDK-1979
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

diff --git a/restapi-call-node/installer/pom.xml b/restapi-call-node/installer/pom.xml
index 19b705a..1e13610 100755 (executable)
--- a/restapi-call-node/installer/pom.xml
+++ b/restapi-call-node/installer/pom.xml
@@ -43,14 +43,6 @@
                        <artifactId>restapi-call-node-provider</artifactId>
                        <version>${project.version}</version>
                </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
        </dependencies>
 
        <build>
@@ -110,7 +102,7 @@
                                                        <useRepositoryLayout>true</useRepositoryLayout>
                                                        <addParentPoms>false</addParentPoms>
                                                        <copyPom>false</copyPom>
-                                                       <excludeGroupIds>org.onap.ccsdk.sli.core</excludeGroupIds>
+                                                       <includeGroupIds>org.onap.ccsdk.sli.plugins</includeGroupIds>
                                                        <scope>provided</scope>
                                                </configuration>
                                        </execution>

diff --git a/restconf-client/installer/pom.xml b/restconf-client/installer/pom.xml
index b1b07cb..db75310 100755 (executable)
--- a/restconf-client/installer/pom.xml
+++ b/restconf-client/installer/pom.xml
@@ -103,7 +103,7 @@
                             <useRepositoryLayout>true</useRepositoryLayout>
                             <addParentPoms>false</addParentPoms>
                             <copyPom>false</copyPom>
-                            <excludeGroupIds>org.onap.ccsdk.sli.core</excludeGroupIds>
+                            <includeGroupIds>org.onap.ccsdk.sli.plugins</includeGroupIds>
                             <scope>provided</scope>
                         </configuration>
                     </execution>

diff --git a/sshapi-call-node/installer/pom.xml b/sshapi-call-node/installer/pom.xml
index 44cc82a..b2f5cb0 100755 (executable)
--- a/sshapi-call-node/installer/pom.xml
+++ b/sshapi-call-node/installer/pom.xml
@@ -43,14 +43,6 @@
                        <artifactId>sshapi-call-node-provider</artifactId>
                        <version>${project.version}</version>
                </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
        </dependencies>
 
        <build>
@@ -110,7 +102,7 @@
                                                        <useRepositoryLayout>true</useRepositoryLayout>
                                                        <addParentPoms>false</addParentPoms>
                                                        <copyPom>false</copyPom>
-                                                       <excludeGroupIds>org.onap.ccsdk.sli.core</excludeGroupIds>
+                                                       <includeGroupIds>org.onap.ccsdk.sli.plugins</includeGroupIds>
                                                        <scope>provided</scope>
                                                </configuration>
                                        </execution>

diff --git a/template-node/installer/pom.xml b/template-node/installer/pom.xml
index b4cd35d..99ef46f 100644 (file)
--- a/template-node/installer/pom.xml
+++ b/template-node/installer/pom.xml
@@ -100,7 +100,7 @@
                                                        <useRepositoryLayout>true</useRepositoryLayout>
                                                        <addParentPoms>false</addParentPoms>
                                                        <copyPom>false</copyPom>
-                                                       <includeGroupIds>org.onap.ccsdk.sli.plugins,org.apache.velocity</includeGroupIds>
+                                                       <includeGroupIds>org.onap.ccsdk.sli.plugins</includeGroupIds>
                                                        <scope>provided</scope>
                                                </configuration>
                                        </execution>