ODL Upgrade Method 2

[appc.git] / appc-outbound / appc-aai-client / features / src / main / resources / features.xml

diff --git a/appc-outbound/appc-aai-client/features/src/main/resources/features.xml b/appc-outbound/appc-aai-client/features/src/main/resources/features.xml
index 6294c89..1043da2 100644 (file)
--- a/appc-outbound/appc-aai-client/features/src/main/resources/features.xml
+++ b/appc-outbound/appc-aai-client/features/src/main/resources/features.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
   =============================================================================
@@ -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=========================================================
   -->
 
@@ -29,21 +28,18 @@
        xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
 
 <!--   <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.version}/xml/features</repository> -->
-        <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
+        <!--<repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>-->
 
        <feature name='appc-aai-client' description="Application Controller AAI Client"
                version='${project.version}'>
                <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
-               <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
+               <feature >odl-mdsal-broker</feature>
                
-               <feature>sdnc-sli</feature>
-               <feature>sdnc-aai-service</feature>
+               <feature>ccsdk-sli</feature>
+               <feature>ccsdk-aai-service</feature>
                <bundle>mvn:commons-lang/commons-lang/2.6</bundle>
                <!-- <bundle>mvn:org.apache.velocity/velocity/${velocity.version}</bundle> -->
                <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle> 
-               <bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle>
-               <bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle>
-               <bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle>
                <bundle>mvn:org.onap.appc/appc-aai-client-provider/${project.version}</bundle>
        </feature>
 </features>