aboutsummaryrefslogtreecommitdiffstats
path: root/appc-outbound/appc-network-inventory-client
diff options
context:
space:
mode:
authorPatrick Brady <patrick.brady@att.com>2019-08-26 13:54:22 -0700
committerPatrick Brady <patrick.brady@att.com>2019-08-30 23:48:02 +0000
commitf2c1c952765c0a4df2545ebec7b7f6e5c59617b1 (patch)
tree47eebc4b0e0f916ee89b0e45c567434343ca6ef8 /appc-outbound/appc-network-inventory-client
parent35d8f73bfed6211b4d0e799880f991b001dbe0a6 (diff)
Changes to fix feature installs
Feature installs were causing karaf to freeze following the upgrade to the Fluorine SR2 version of ODL. These changes correct the problems. Change-Id: I8e5a41ba6816da782fea3ebaef3b6918cfc1ad4c Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1630
Diffstat (limited to 'appc-outbound/appc-network-inventory-client')
-rw-r--r--appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/pom.xml24
-rwxr-xr-xappc-outbound/appc-network-inventory-client/provider/pom.xml7
2 files changed, 1 insertions, 30 deletions
diff --git a/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/pom.xml b/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/pom.xml
index 922615336..250651e79 100644
--- a/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/pom.xml
+++ b/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/pom.xml
@@ -3,7 +3,7 @@
============LICENSE_START=======================================================
ONAP : APPC
================================================================================
-Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
=============================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -50,28 +50,6 @@ limitations under the License.
<classifier>features</classifier>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons.collections.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </dependency>
- <dependency>
<groupId>org.onap.appc</groupId>
<artifactId>appc-config-params-provider</artifactId>
<version>${project.version}</version>
diff --git a/appc-outbound/appc-network-inventory-client/provider/pom.xml b/appc-outbound/appc-network-inventory-client/provider/pom.xml
index 58d0e9e39..fdd1ca110 100755
--- a/appc-outbound/appc-network-inventory-client/provider/pom.xml
+++ b/appc-outbound/appc-network-inventory-client/provider/pom.xml
@@ -51,7 +51,6 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
</dependency>
<dependency>
<groupId>com.att.eelf</groupId>
@@ -76,13 +75,11 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
- <version>1.6.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
- <version>1.6.4</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -115,12 +112,10 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
- <version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>${snakeyaml.version}</version>
</dependency>
</dependencies>
@@ -137,9 +132,7 @@
<Export-Package>org.onap.appc.instar</Export-Package>
<Import-Package>*</Import-Package>
<Embed-Dependency>jackson-dataformat-yaml,snakeyaml</Embed-Dependency>
- <DynamicImport-Package>*</DynamicImport-Package>
</instructions>
- <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
</configuration>
</plugin>
</plugins>