summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-12-04 11:08:46 -0500
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-12-04 11:08:46 -0500
commit16cb0dd6b9ebe62ee6cb03629d3529057c5d00d3 (patch)
tree30c70f9033b48a1144d63fd75dbeadbeb168fb61
parentf6dde48113e1ee382272f4ece15573bfb03121c2 (diff)
Clean up installers
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: I3459d2d5a82899ad21b1b25daae6f6d182d972af Issue-ID: CCSDK-1979 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
-rwxr-xr-xdblib/installer/pom.xml12
-rwxr-xr-xsli/installer/pom.xml14
-rwxr-xr-xsliPluginUtils/installer/pom.xml6
3 files changed, 4 insertions, 28 deletions
diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml
index 0c5204b9b..bf19ba0eb 100755
--- a/dblib/installer/pom.xml
+++ b/dblib/installer/pom.xml
@@ -45,14 +45,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jdbc</artifactId>
- </dependency>
</dependencies>
<build>
@@ -111,8 +103,8 @@
<useRepositoryLayout>true</useRepositoryLayout>
<addParentPoms>false</addParentPoms>
<copyPom>false</copyPom>
- <includeGroupIds>org.onap.ccsdk.sli.core,org.apache.tomcat,org.slf4j</includeGroupIds>
- <excludeArtifactIds>utils-provider,slf4j-api</excludeArtifactIds>
+ <includeGroupIds>org.onap.ccsdk.sli.core</includeGroupIds>
+ <excludeArtifactIds>utils-provider</excludeArtifactIds>
<scope>provided</scope>
</configuration>
</execution>
diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml
index 937e54c5b..866e9b03f 100755
--- a/sli/installer/pom.xml
+++ b/sli/installer/pom.xml
@@ -66,18 +66,6 @@
<artifactId>sli-recording</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.att.eelf</groupId>
- <artifactId>eelf-core</artifactId>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </dependency>
</dependencies>
@@ -137,7 +125,7 @@
<useRepositoryLayout>true</useRepositoryLayout>
<addParentPoms>false</addParentPoms>
<copyPom>false</copyPom>
- <includeGroupIds>org.onap.ccsdk.sli.core,com.att.eelf,ch.qos.logback</includeGroupIds>
+ <includeGroupIds>org.onap.ccsdk.sli.core</includeGroupIds>
<excludeArtifactIds>utils-provider,dblib-provider</excludeArtifactIds>
<scope>provided</scope>
</configuration>
diff --git a/sliPluginUtils/installer/pom.xml b/sliPluginUtils/installer/pom.xml
index 82ee5d186..9d71a964f 100755
--- a/sliPluginUtils/installer/pom.xml
+++ b/sliPluginUtils/installer/pom.xml
@@ -66,10 +66,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- </dependency>
</dependencies>
<build>
@@ -128,7 +124,7 @@
<useRepositoryLayout>true</useRepositoryLayout>
<addParentPoms>false</addParentPoms>
<copyPom>false</copyPom>
- <includeArtifactIds>sliPluginUtils-provider,ccsdk-sliPluginUtils,features-sliPluginUtils,commons-text</includeArtifactIds>
+ <includeArtifactIds>sliPluginUtils-provider,ccsdk-sliPluginUtils,features-sliPluginUtils</includeArtifactIds>
<scope>provided</scope>
</configuration>
</execution>