diff options
| author |   Patrick Brady <pb071s@att.com> | 2018-03-22 15:12:48 -0700 |
|---|---|---|
| committer | Patrick Brady <pb071s@att.com> | 2018-04-11 17:42:20 +0000 |
| commit | 5b81764739425ccb4a418947e1565a7f691f4204 (patch) | |
| tree | 245b7d69f2bc2c093c88bc9fb3c2c3757468e9c1 /appc-config/appc-encryption-tool/provider | |
| parent | abd3c649e4e50d9e1e995f81cb080e470eb02b48 (diff) | |
ODL Upgrade Method 2
Changes necessary to support upgrade to ODL Nitrogen,
while continuing to use Karaf 3 style features
Change-Id: I2edf619e0b889420c32793b958c0926b0311e71d
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-403
Diffstat (limited to 'appc-config/appc-encryption-tool/provider')
| -rw-r--r-- | appc-config/appc-encryption-tool/provider/pom.xml | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/appc-config/appc-encryption-tool/provider/pom.xml b/appc-config/appc-encryption-tool/provider/pom.xml index b79d728da..5df563200 100644 --- a/appc-config/appc-encryption-tool/provider/pom.xml +++ b/appc-config/appc-encryption-tool/provider/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP : APPC ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. Copyright (C) 2017 Amdocs ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,7 +18,6 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= - ECOMP is a trademark and service mark of AT&T Intellectual Property. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> @@ -48,7 +47,7 @@ <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>sql-resource-provider</artifactId> - <version>${ccsdk.sli.adaptors.version}</version> + <version>${ccsdk.sli.adaptors.version}</version> </dependency> <dependency> <groupId>commons-io</groupId> @@ -61,6 +60,10 @@ <scope>compile</scope> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> <groupId>com.att.eelf</groupId> <artifactId>eelf-core</artifactId> </dependency> @@ -87,7 +90,9 @@ <Bundle-SymbolicName>org.onap.appc.encryptiontool</Bundle-SymbolicName> <Bundle-Activator>org.onap.appc.encryptiontool.EncryptionToolActivator</Bundle-Activator> <Export-Package>org.onap.appc.encryptiontool</Export-Package> - <Import-Package>*</Import-Package> + <Import-Package>!com.google.common.collect,*;resolution:=optional</Import-Package> + <!-- <Embed-Dependency>guava,logback-core,logback-classic,eelf-core,jasypt,commons-configuration</Embed-Dependency> --> + <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|!appc-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis</Embed-Dependency> <DynamicImport-Package>*</DynamicImport-Package> </instructions> <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation> |