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: I02cbe548db11ed453cb2f5ac9ac4b63cd247a511
Issue-ID: CCSDK-1979
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

diff --git a/ansible-adapter/ansible-adapter-installer/pom.xml b/ansible-adapter/ansible-adapter-installer/pom.xml
index 5f71725..f4eee6e 100644 (file)
--- a/ansible-adapter/ansible-adapter-installer/pom.xml
+++ b/ansible-adapter/ansible-adapter-installer/pom.xml
@@ -119,7 +119,8 @@
                             <useRepositoryLayout>true</useRepositoryLayout>
                             <addParentPoms>false</addParentPoms>
                             <copyPom>false</copyPom>
-                            <excludeGroupIds>org.opendaylight</excludeGroupIds>
+                            <includeGroupIds>org.onap.ccsdk.sli.adaptors</includeGroupIds>
+
                             <scope>provided</scope>
                         </configuration>
                     </execution>

diff --git a/pom.xml b/pom.xml
index 81a8d1c..c8fe415 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
         <module>mdsal-resource</module>
         <module>resource-assignment</module>
         <module>sql-resource</module>
-       <module>base</module>
+           <module>base</module>
         <module>message-router</module>
         <module>features</module>
         <module>artifacts</module>

diff --git a/resource-assignment/installer/pom.xml b/resource-assignment/installer/pom.xml
index 9d111a6..7055ebf 100755 (executable)
--- a/resource-assignment/installer/pom.xml
+++ b/resource-assignment/installer/pom.xml
@@ -45,21 +45,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -119,7 +104,7 @@
                             <useRepositoryLayout>true</useRepositoryLayout>
                             <addParentPoms>false</addParentPoms>
                             <copyPom>false</copyPom>
-                            <excludeGroupIds>org.onap.ccsdk.sli.core,org.opendaylight</excludeGroupIds>
+                            <includeGroupIds>org.onap.ccsdk.sli.adaptors</includeGroupIds>
                             <scope>provided</scope>
                         </configuration>
                     </execution>

diff --git a/saltstack-adapter/saltstack-adapter-installer/pom.xml b/saltstack-adapter/saltstack-adapter-installer/pom.xml
index 47deb55..96c59a0 100644 (file)
--- a/saltstack-adapter/saltstack-adapter-installer/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-installer/pom.xml
@@ -132,7 +132,7 @@
                             <useRepositoryLayout>true</useRepositoryLayout>
                             <addParentPoms>false</addParentPoms>
                             <copyPom>false</copyPom>
-                            <excludeGroupIds>org.opendaylight</excludeGroupIds>
+                            <includeGroupIds>org.onap.ccsdk.sli.adaptors</includeGroupIds>
                             <scope>provided</scope>
                         </configuration>
                     </execution>