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-common | |
| 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-common')
| -rw-r--r-- | appc-common/pom.xml | 5 | ||||
| -rw-r--r-- | appc-common/src/main/java/org/onap/appc/metadata/impl/MetadataServiceImpl.java | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/appc-common/pom.xml b/appc-common/pom.xml index 499940189..43e412529 100644 --- a/appc-common/pom.xml +++ b/appc-common/pom.xml @@ -2,7 +2,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"); @@ -17,7 +17,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"> <modelVersion>4.0.0</modelVersion> @@ -154,7 +153,7 @@ org.onap.appc.*, com.att.eelf.*, ch.qos.logback.*, org.jasypt.* </Export-Package> <Import-Package>*;resolution:=optional</Import-Package> - <Embed-Dependency>eelf-core, logback-core, logback-classic, jasypt</Embed-Dependency> + <Embed-Dependency>eelf-core, logback-core, logback-classic, jasypt, dblib-provider</Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> </instructions> </configuration> diff --git a/appc-common/src/main/java/org/onap/appc/metadata/impl/MetadataServiceImpl.java b/appc-common/src/main/java/org/onap/appc/metadata/impl/MetadataServiceImpl.java index 79d0ffac2..70d2e6363 100644 --- a/appc-common/src/main/java/org/onap/appc/metadata/impl/MetadataServiceImpl.java +++ b/appc-common/src/main/java/org/onap/appc/metadata/impl/MetadataServiceImpl.java @@ -2,7 +2,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 * ============================================================================= @@ -18,7 +18,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. * ============LICENSE_END========================================================= */ |