diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-12-05 14:09:05 -0500 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-12-05 14:09:05 -0500 |
| commit | 98e280c2cd8a777ed953606022aa7afd94b38d18 (patch) | |
| tree | 077c3cb218107b83c47c48348b79f47dd8a9e1cb | |
| parent | 54f98b397826e9d4281af1446b0227cdcf36f4a3 (diff) | |
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>
| -rw-r--r-- | ansible-adapter/ansible-adapter-installer/pom.xml | 3 | ||||
| -rwxr-xr-x | pom.xml | 2 | ||||
| -rwxr-xr-x | resource-assignment/installer/pom.xml | 17 | ||||
| -rw-r--r-- | saltstack-adapter/saltstack-adapter-installer/pom.xml | 2 |
4 files changed, 5 insertions, 19 deletions
diff --git a/ansible-adapter/ansible-adapter-installer/pom.xml b/ansible-adapter/ansible-adapter-installer/pom.xml index 5f71725c..f4eee6e6 100644 --- 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> @@ -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 9d111a6e..7055ebf6 100755 --- 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 47deb556..96c59a04 100644 --- 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> |