Merge "Migration to use MD-SAL Project"
authorY. Richard Yang <yry@cs.yale.edu>
Fri, 11 Sep 2015 00:16:05 +0000 (00:16 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 11 Sep 2015 00:16:05 +0000 (00:16 +0000)
1  2 
features/pom.xml
features/src/main/resources/features.xml
pom.xml

Simple merge
index 831d3a542525a997e332c0d452dfa703e6d18e26,c8f19889a291b0402744b49513cd7d4d6985edbe..36d9ee3eb0c76e59564aeba6990cc659eb8bce7e
@@@ -9,9 -9,9 +9,9 @@@ and is available at http://www.eclipse.
  <features name="odl-alto-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-   <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
+   <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
    <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
 -  <repository>mvn:org.opendaylight.controller/features-restconf/${mdsal.version}/xml/features</repository>
 +  <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
    <repository>mvn:org.opendaylight.l2switch/features-l2switch/${l2switch.version}/xml/features</repository>
  
    <feature name='odl-alto-all' version='${project.version}' description='OpenDaylight :: alto :: All '>
diff --cc pom.xml
Simple merge