From 571fb7646ee8a21b4cbc657a02fa82ecd8ee5430 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Thu, 5 Dec 2019 14:56:23 -0500
Subject: [PATCH] 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>
---
 restapi-call-node/installer/pom.xml | 10 +---------
 restconf-client/installer/pom.xml   |  2 +-
 sshapi-call-node/installer/pom.xml  | 10 +---------
 template-node/installer/pom.xml     |  2 +-
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/restapi-call-node/installer/pom.xml b/restapi-call-node/installer/pom.xml
index 19b705ad..1e136100 100755
--- 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 b1b07cbc..db75310b 100755
--- 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 44cc82a6..b2f5cb02 100755
--- 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 b4cd35dc..99ef46ff 100644
--- 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>
-- 
2.16.6