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
diff --git a/appc-directed-graph/dg-loader/features/src/main/resources/features.xml b/appc-directed-graph/dg-loader/features/src/main/resources/features.xml
index 633dd94..680dba0 100644
--- a/appc-directed-graph/dg-loader/features/src/main/resources/features.xml
+++ b/appc-directed-graph/dg-loader/features/src/main/resources/features.xml
@@ -3,7 +3,7 @@
============LICENSE_START=======================================================
ONAP : APP-C
================================================================================
- Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017-2018 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.
@@ -30,7 +30,7 @@
version='${project.version}'>
<!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
<feature>odl-mdsal-broker</feature>
- <feature>sdnc-sli</feature>
+ <feature>ccsdk-sli</feature>
<bundle>mvn:commons-lang/commons-lang/2.6</bundle>
<bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle>
<bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle>
diff --git a/appc-directed-graph/dg-loader/pom.xml b/appc-directed-graph/dg-loader/pom.xml
index 03ead25..228d5d8 100644
--- a/appc-directed-graph/dg-loader/pom.xml
+++ b/appc-directed-graph/dg-loader/pom.xml
@@ -19,7 +19,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=========================================================
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -45,7 +44,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version.source>1.8</java.version.source>
<java.version.target>1.8</java.version.target>
- <logback.version>1.2.0</logback.version>
+ <logback.version>1.1.1</logback.version>
<commons.collections.version>3.2.2</commons.collections.version>
<common.io.version>2.5</common.io.version>
<jettison.version>1.3.7</jettison.version>