X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fcommons%2Fopendaylight%2Fpom.xml;h=37bd28de4e1d4e885ac3955e350689adbe023c8a;hp=39c5672ca0ccea8db8b17d38f818c37ed70063ea;hb=11c04cc6c57250b575d43aa55402c8a780db1423;hpb=0b9c6c495bae321c38f274602f14e91d1e16db58

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 39c5672ca0..37bd28de4e 100644
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -4,30 +4,31 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath></relativePath>
   </parent>
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>commons.opendaylight</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.6.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
-
-    <akka.version>2.3.4</akka.version>
-    <appauth.version>0.5.0-SNAPSHOT</appauth.version>
-    <archetype-app-northbound>0.1.0-SNAPSHOT</archetype-app-northbound>
-    <arphandler.version>0.6.0-SNAPSHOT</arphandler.version>
+    <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
+    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
+    <akka.version>2.3.10</akka.version>
+    <appauth.version>0.6.0-SNAPSHOT</appauth.version>
+    <archetype-app-northbound>0.2.0-SNAPSHOT</archetype-app-northbound>
+    <arphandler.version>0.7.0-SNAPSHOT</arphandler.version>
     <!-- Plugin Versions -->
-    <bundlescanner.api.version>0.5.0-SNAPSHOT</bundlescanner.api.version>
-    <bundlescanner.implementation.version>0.5.0-SNAPSHOT</bundlescanner.implementation.version>
-    <bundlescanner.version>0.5.0-SNAPSHOT</bundlescanner.version>
-    <clustering.services.version>0.6.0-SNAPSHOT</clustering.services.version>
-    <clustering.services_implementation.version>0.5.0-SNAPSHOT</clustering.services_implementation.version>
-    <clustering.stub.version>0.5.0-SNAPSHOT</clustering.stub.version>
-    <clustering.test.version>0.5.0-SNAPSHOT</clustering.test.version>
-    <commmons.northbound.version>0.5.0-SNAPSHOT</commmons.northbound.version>
+    <bundlescanner.api.version>0.6.0-SNAPSHOT</bundlescanner.api.version>
+    <bundlescanner.implementation.version>0.6.0-SNAPSHOT</bundlescanner.implementation.version>
+    <bundlescanner.version>0.6.0-SNAPSHOT</bundlescanner.version>
+    <clustering.services.version>0.7.0-SNAPSHOT</clustering.services.version>
+    <clustering.services_implementation.version>0.6.0-SNAPSHOT</clustering.services_implementation.version>
+    <clustering.stub.version>0.6.0-SNAPSHOT</clustering.stub.version>
+    <clustering.test.version>0.6.0-SNAPSHOT</clustering.test.version>
+    <commmons.northbound.version>0.6.0-SNAPSHOT</commmons.northbound.version>
     <!-- Third Party Versions -->
     <codahale.metrics.version>3.0.1</codahale.metrics.version>
 
@@ -41,116 +42,110 @@
     <commons.tomcat.api>7.0.53.v201406060720</commons.tomcat.api>
     <commons.tomcat.util>7.0.53.v201406070630</commons.tomcat.util>
 
-    <commons.checkstyle.version>0.1.0-SNAPSHOT</commons.checkstyle.version>
-    <commons.httpclient.version>0.2.0-SNAPSHOT</commons.httpclient.version>
-    <commons.logback_settings.version>0.1.0-SNAPSHOT</commons.logback_settings.version>
+    <commons.checkstyle.version>0.2.0-SNAPSHOT</commons.checkstyle.version>
+    <commons.httpclient.version>0.3.0-SNAPSHOT</commons.httpclient.version>
+    <commons.logback_settings.version>0.2.0-SNAPSHOT</commons.logback_settings.version>
     <commons.net.version>3.0.1</commons.net.version>
-    <commons.opendaylight.commons.httpclient>0.2.0-SNAPSHOT</commons.opendaylight.commons.httpclient>
-    <commons.opendaylight.concepts.version>0.6.0-SNAPSHOT</commons.opendaylight.concepts.version>
-    <commons.opendaylight.version>1.5.0-SNAPSHOT</commons.opendaylight.version>
-    <commons.parent.version>1.1.0-SNAPSHOT</commons.parent.version>
-    <commons.httpclient.version>0.2.0-SNAPSHOT</commons.httpclient.version>
-    <concepts.version>0.6.0-SNAPSHOT</concepts.version>
+    <commons.opendaylight.commons.httpclient>0.3.0-SNAPSHOT</commons.opendaylight.commons.httpclient>
+    <commons.opendaylight.concepts.version>0.7.0-SNAPSHOT</commons.opendaylight.concepts.version>
+    <commons.opendaylight.version>1.6.0-SNAPSHOT</commons.opendaylight.version>
+    <commons.parent.version>1.2.0-SNAPSHOT</commons.parent.version>
+    <commons.httpclient.version>0.3.0-SNAPSHOT</commons.httpclient.version>
+    <concepts.version>0.7.0-SNAPSHOT</concepts.version>
     <concurrentlinkedhashmap.version>1.4</concurrentlinkedhashmap.version>
-    <config.version>0.3.0-SNAPSHOT</config.version>
-    <aaa.version>0.2.0-SNAPSHOT</aaa.version>
+    <config.version>0.4.0-SNAPSHOT</config.version>
+    <aaa.version>0.3.0-SNAPSHOT</aaa.version>
     <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
     <config.clustering.configfile>05-clustering.xml</config.clustering.configfile>
+    <config.clustered-entity-ownership.configfile>06-clustered-entity-ownership.xml</config.clustered-entity-ownership.configfile>
     <config.netty.configfile>00-netty.xml</config.netty.configfile>
     <config.mdsal.configfile>01-md-sal.xml</config.mdsal.configfile>
     <config.xsql.configfile>04-xsql.xml</config.xsql.configfile>
-    <config.netconf.client.configfile>01-netconf.xml</config.netconf.client.configfile>
     <config.toaster.configfile>03-toaster-sample.xml</config.toaster.configfile>
     <config.restconf.configfile>10-rest-connector.xml</config.restconf.configfile>
-    <config.netconf.connector.configfile>99-netconf-connector.xml</config.netconf.connector.configfile>
-    <configuration.implementation.version>0.5.0-SNAPSHOT</configuration.implementation.version>
-    <configuration.version>0.5.0-SNAPSHOT</configuration.version>
-    <connectionmanager.version>0.2.0-SNAPSHOT</connectionmanager.version>
-    <containermanager.it.version>0.6.0-SNAPSHOT</containermanager.it.version>
-    <containermanager.northbound.version>0.5.0-SNAPSHOT</containermanager.northbound.version>
-    <containermanager.shell.version>0.6.0-SNAPSHOT</containermanager.shell.version>
-    <containermanager.version>0.6.0-SNAPSHOT</containermanager.version>
-    <controllermanager.northbound.version>0.1.0-SNAPSHOT</controllermanager.northbound.version>
-    <devices.web.version>0.5.0-SNAPSHOT</devices.web.version>
-    <dummy-console.version>1.2.0-SNAPSHOT</dummy-console.version>
+
+    <configuration.implementation.version>0.6.0-SNAPSHOT</configuration.implementation.version>
+    <configuration.version>0.6.0-SNAPSHOT</configuration.version>
+    <connectionmanager.version>0.3.0-SNAPSHOT</connectionmanager.version>
+    <containermanager.it.version>0.7.0-SNAPSHOT</containermanager.it.version>
+    <containermanager.northbound.version>0.6.0-SNAPSHOT</containermanager.northbound.version>
+    <containermanager.shell.version>0.7.0-SNAPSHOT</containermanager.shell.version>
+    <containermanager.version>0.7.0-SNAPSHOT</containermanager.version>
+    <controllermanager.northbound.version>0.2.0-SNAPSHOT</controllermanager.northbound.version>
+    <devices.web.version>0.6.0-SNAPSHOT</devices.web.version>
+    <dummy-console.version>1.3.0-SNAPSHOT</dummy-console.version>
     <config.statistics.manager.configfile>30-statistics-manager.xml</config.statistics.manager.configfile>
-    <eclipse.persistence.version>2.5.0</eclipse.persistence.version>
     <eclipse.jdt.core.compiler.batch.version>3.8.0.I20120518-2145</eclipse.jdt.core.compiler.batch.version>
 
     <!-- OpenEXI third party lib for netconf-->
-    <exi.nagasena.version>0000.0002.0038.0</exi.nagasena.version>
+    <exi.nagasena.version>0000.0002.0053.0</exi.nagasena.version>
     <felix.util.version>1.6.0</felix.util.version>
-    <filtervalve.version>1.5.0-SNAPSHOT</filtervalve.version>
+    <features.test.version>1.6.0-SNAPSHOT</features.test.version>
+    <filtervalve.version>1.6.0-SNAPSHOT</filtervalve.version>
     <findbugs.maven.plugin.version>2.4.0</findbugs.maven.plugin.version>
-    <flowprogrammer.northbound.version>0.5.0-SNAPSHOT</flowprogrammer.northbound.version>
-    <flows.web.version>0.5.0-SNAPSHOT</flows.web.version>
-    <forwarding.staticrouting>0.6.0-SNAPSHOT</forwarding.staticrouting>
-    <forwarding.staticrouting.northbound.version>0.5.0-SNAPSHOT</forwarding.staticrouting.northbound.version>
-    <forwardingrulesmanager.implementation.version>0.5.0-SNAPSHOT</forwardingrulesmanager.implementation.version>
-    <forwardingrulesmanager.version>0.7.0-SNAPSHOT</forwardingrulesmanager.version>
-    <hosttracker.api.version>0.6.0-SNAPSHOT</hosttracker.api.version>
-    <hosttracker.implementation.version>0.6.0-SNAPSHOT</hosttracker.implementation.version>
-    <hosttracker.northbound.version>0.5.0-SNAPSHOT</hosttracker.northbound.version>
-    <hosttracker.shell.version>1.1.0-SNAPSHOT</hosttracker.shell.version>
-    <hosttracker_new.api.version>0.5.0-SNAPSHOT</hosttracker_new.api.version>
-    <hosttracker_new.implementation.version>0.5.0-SNAPSHOT</hosttracker_new.implementation.version>
-    <httpservice-bridge.northbound.version>0.1.0-SNAPSHOT</httpservice-bridge.northbound.version>
-    <ietf-inet-types.version>2010.09.24.7-SNAPSHOT</ietf-inet-types.version>
-    <ietf-restconf.version>2013.10.19.7-SNAPSHOT</ietf-restconf.version>
-    <ietf-topology.version>2013.10.21.7-SNAPSHOT</ietf-topology.version>
-    <ietf-yang-types.version>2010.09.24.7-SNAPSHOT</ietf-yang-types.version>
+    <flowprogrammer.northbound.version>0.6.0-SNAPSHOT</flowprogrammer.northbound.version>
+    <flows.web.version>0.6.0-SNAPSHOT</flows.web.version>
+    <forwarding.staticrouting>0.7.0-SNAPSHOT</forwarding.staticrouting>
+    <forwarding.staticrouting.northbound.version>0.6.0-SNAPSHOT</forwarding.staticrouting.northbound.version>
+    <forwardingrulesmanager.implementation.version>0.6.0-SNAPSHOT</forwardingrulesmanager.implementation.version>
+    <forwardingrulesmanager.version>0.8.0-SNAPSHOT</forwardingrulesmanager.version>
+    <hosttracker.api.version>0.7.0-SNAPSHOT</hosttracker.api.version>
+    <hosttracker.implementation.version>0.7.0-SNAPSHOT</hosttracker.implementation.version>
+    <hosttracker.northbound.version>0.6.0-SNAPSHOT</hosttracker.northbound.version>
+    <hosttracker.shell.version>1.2.0-SNAPSHOT</hosttracker.shell.version>
+    <hosttracker_new.api.version>0.6.0-SNAPSHOT</hosttracker_new.api.version>
+    <hosttracker_new.implementation.version>0.6.0-SNAPSHOT</hosttracker_new.implementation.version>
+    <httpservice-bridge.northbound.version>0.2.0-SNAPSHOT</httpservice-bridge.northbound.version>
+    <ietf-inet-types.version>2010.09.24.8-SNAPSHOT</ietf-inet-types.version>
+    <ietf-restconf.version>2013.10.19.8-SNAPSHOT</ietf-restconf.version>
+    <ietf-topology.version>2013.10.21.8-SNAPSHOT</ietf-topology.version>
+    <ietf-yang-types.version>2010.09.24.8-SNAPSHOT</ietf-yang-types.version>
     <jdepend.maven.plugin.version>2.0-beta-2</jdepend.maven.plugin.version>
     <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
-    <jolokia-bridge.version>0.1.0-SNAPSHOT</jolokia-bridge.version>
+    <jolokia-bridge.version>0.2.0-SNAPSHOT</jolokia-bridge.version>
     <jolokia.version>1.1.4</jolokia.version>
     <jsr311.api.version>1.1.1</jsr311.api.version>
     <jsr311.v2.api.version>2.0</jsr311.v2.api.version>
-    <karaf.branding.version>1.1.0-SNAPSHOT</karaf.branding.version>
-    <karaf.shell.version>3.0.0</karaf.shell.version>
-    <karaf.version>3.0.1</karaf.version>
+    <karaf.branding.version>1.2.0-SNAPSHOT</karaf.branding.version>
+    <karaf.shell.version>${karaf.version}</karaf.shell.version>
     <leveldb.version>0.7</leveldb.version>
-    <leveldbjni.version>1.8</leveldbjni.version>
+    <leveldbjni.version>1.8-odl</leveldbjni.version>
     <lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
-    <logging.bridge.version>0.5.0-SNAPSHOT</logging.bridge.version>
+    <logging.bridge.version>0.6.0-SNAPSHOT</logging.bridge.version>
     <maven.plugin.api.version>3.0.5</maven.plugin.api.version>
     <mimepull.version>1.9.4</mimepull.version>
-    <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-    <netconf.version>0.3.0-SNAPSHOT</netconf.version>
-    <networkconfig.bridgedomain.northbound.version>0.1.0-SNAPSHOT</networkconfig.bridgedomain.northbound.version>
-    <networkconfig.neutron.implementation.version>0.5.0-SNAPSHOT</networkconfig.neutron.implementation.version>
-    <networkconfig.neutron.northbound.version>0.5.0-SNAPSHOT</networkconfig.neutron.northbound.version>
-    <networkconfig.neutron.version>0.5.0-SNAPSHOT</networkconfig.neutron.version>
+    <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+    <networkconfig.bridgedomain.northbound.version>0.2.0-SNAPSHOT</networkconfig.bridgedomain.northbound.version>
     <!-- ODL repository / plugin repository -->
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
-    <northbound.commons.version>0.5.0-SNAPSHOT</northbound.commons.version>
-    <northbound.hosttracker.version>1.5.0-SNAPSHOT</northbound.hosttracker.version>
-    <northbound.jolokia.version>1.5.0-SNAPSHOT</northbound.jolokia.version>
-    <opendaylight-l2-types.version>2013.08.27.7-SNAPSHOT</opendaylight-l2-types.version>
-    <osgi-brandfragment.web.version>0.1.0-SNAPSHOT</osgi-brandfragment.web.version>
+    <northbound.commons.version>0.6.0-SNAPSHOT</northbound.commons.version>
+    <northbound.hosttracker.version>1.6.0-SNAPSHOT</northbound.hosttracker.version>
+    <northbound.jolokia.version>1.6.0-SNAPSHOT</northbound.jolokia.version>
+    <opendaylight-l2-types.version>2013.08.27.8-SNAPSHOT</opendaylight-l2-types.version>
+    <osgi-brandfragment.web.version>0.2.0-SNAPSHOT</osgi-brandfragment.web.version>
     <parboiled.version>1.1.6</parboiled.version>
     <parboiled.scala.version>1.1.6</parboiled.scala.version>
     <propertymavenplugin.version>1.0-alpha-2</propertymavenplugin.version>
     <protobuf.version>2.5.0</protobuf.version>
-    <protocol-framework.version>0.6.0-SNAPSHOT</protocol-framework.version>
-    <protocol_plugins.openflow.version>0.5.0-SNAPSHOT</protocol_plugins.openflow.version>
-    <protocol_plugins.stub.version>0.5.0-SNAPSHOT</protocol_plugins.stub.version>
-    <routing.dijkstra_implementation.version>0.5.0-SNAPSHOT</routing.dijkstra_implementation.version>
-    <sal.connection.version>0.2.0-SNAPSHOT</sal.connection.version>
-    <sal.implementation.version>0.5.0-SNAPSHOT</sal.implementation.version>
-    <sal.networkconfiguration.version>0.1.0-SNAPSHOT</sal.networkconfiguration.version>
-    <sal.version>0.9.0-SNAPSHOT</sal.version>
+    <protocol-framework.version>0.7.0-SNAPSHOT</protocol-framework.version>
+    <protocol_plugins.openflow.version>0.6.0-SNAPSHOT</protocol_plugins.openflow.version>
+    <protocol_plugins.stub.version>0.6.0-SNAPSHOT</protocol_plugins.stub.version>
+    <routing.dijkstra_implementation.version>0.6.0-SNAPSHOT</routing.dijkstra_implementation.version>
+    <sal.connection.version>0.3.0-SNAPSHOT</sal.connection.version>
+    <sal.implementation.version>0.6.0-SNAPSHOT</sal.implementation.version>
+    <sal.networkconfiguration.version>0.2.0-SNAPSHOT</sal.networkconfiguration.version>
+    <sal.version>0.10.0-SNAPSHOT</sal.version>
     <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
-    <samples.loadbalancer>0.6.0-SNAPSHOT</samples.loadbalancer>
-    <samples.loadbalancer.northbound.version>0.5.0-SNAPSHOT</samples.loadbalancer.northbound.version>
-    <samples.simpleforwarding.version>0.5.0-SNAPSHOT</samples.simpleforwarding.version>
-    <sanitytest.version>0.5.0-SNAPSHOT</sanitytest.version>
+    <samples.loadbalancer>0.7.0-SNAPSHOT</samples.loadbalancer>
+    <samples.loadbalancer.northbound.version>0.6.0-SNAPSHOT</samples.loadbalancer.northbound.version>
+    <samples.simpleforwarding.version>0.6.0-SNAPSHOT</samples.simpleforwarding.version>
+    <sanitytest.version>0.6.0-SNAPSHOT</sanitytest.version>
     <scala.version>2.10</scala.version>
     <scala.micro.version>4</scala.micro.version>
-    <security.version>0.5.0-SNAPSHOT</security.version>
-    <karaf.security.version>0.5.0-SNAPSHOT</karaf.security.version>
+    <security.version>0.6.0-SNAPSHOT</security.version>
+    <karaf.security.version>0.6.0-SNAPSHOT</karaf.security.version>
     <shapeless.version>1.2.4</shapeless.version>
     <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
-    <sonar.branch>${user.name}-private-view</sonar.branch>
     <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
     <!-- Sonar properties using jacoco to retrieve integration test results -->
     <sonar-jacoco-listeners.version>2.4</sonar-jacoco-listeners.version>
@@ -164,31 +159,31 @@
     <spring-security-karaf.version>3.1.4.RELEASE</spring-security-karaf.version>
     <spring-security.version>3.1.3.RELEASE</spring-security.version>
     <spring.version>3.1.3.RELEASE</spring.version>
-    <statistics.northbound.version>0.5.0-SNAPSHOT</statistics.northbound.version>
-    <statisticsmanager.implementation.version>0.5.0-SNAPSHOT</statisticsmanager.implementation.version>
-    <statisticsmanager.version>0.6.0-SNAPSHOT</statisticsmanager.version>
-    <subnets.northbound.version>0.5.0-SNAPSHOT</subnets.northbound.version>
+    <statistics.northbound.version>0.6.0-SNAPSHOT</statistics.northbound.version>
+    <statisticsmanager.implementation.version>0.6.0-SNAPSHOT</statisticsmanager.implementation.version>
+    <statisticsmanager.version>0.7.0-SNAPSHOT</statisticsmanager.version>
+    <subnets.northbound.version>0.6.0-SNAPSHOT</subnets.northbound.version>
     <surefire.version>2.15</surefire.version>
-    <switchmanager.api.version>0.8.0-SNAPSHOT</switchmanager.api.version>
-    <switchmanager.implementation.version>0.5.0-SNAPSHOT</switchmanager.implementation.version>
-    <switchmanager.northbound.version>0.5.0-SNAPSHOT</switchmanager.northbound.version>
+    <switchmanager.api.version>0.9.0-SNAPSHOT</switchmanager.api.version>
+    <switchmanager.implementation.version>0.6.0-SNAPSHOT</switchmanager.implementation.version>
+    <switchmanager.northbound.version>0.6.0-SNAPSHOT</switchmanager.northbound.version>
     <testvm.argLine>-Xmx1024m -XX:MaxPermSize=256m</testvm.argLine>
-    <topology.northbound.version>0.5.0-SNAPSHOT</topology.northbound.version>
-    <topology.web.version>0.5.0-SNAPSHOT</topology.web.version>
-    <topologymanager.version>0.5.0-SNAPSHOT</topologymanager.version>
-    <topologymanager.shell.version>1.1.0-SNAPSHOT</topologymanager.shell.version>
-    <troubleshoot.web.version>0.5.0-SNAPSHOT</troubleshoot.web.version>
+    <topology.northbound.version>0.6.0-SNAPSHOT</topology.northbound.version>
+    <topology.web.version>0.6.0-SNAPSHOT</topology.web.version>
+    <topologymanager.version>0.6.0-SNAPSHOT</topologymanager.version>
+    <topologymanager.shell.version>1.2.0-SNAPSHOT</topologymanager.shell.version>
+    <troubleshoot.web.version>0.6.0-SNAPSHOT</troubleshoot.web.version>
     <typesafe.config.version>1.2.0</typesafe.config.version>
     <uncommons.maths.version>1.2.2a</uncommons.maths.version>
-    <usermanager.implementation.version>0.5.0-SNAPSHOT</usermanager.implementation.version>
-    <usermanager.northbound.version>0.1.0-SNAPSHOT</usermanager.northbound.version>
-    <usermanager.version>0.5.0-SNAPSHOT</usermanager.version>
-    <nsf.version>0.5.0-SNAPSHOT</nsf.version>
-    <web.version>0.5.0-SNAPSHOT</web.version>
-    <yang-ext.version>2013.09.07.7-SNAPSHOT</yang-ext.version>
-    <yang-jmx-generator.version>1.1.0-SNAPSHOT</yang-jmx-generator.version>
-    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-    <sshd-core.version>0.12.0</sshd-core.version>
+    <usermanager.implementation.version>0.6.0-SNAPSHOT</usermanager.implementation.version>
+    <usermanager.northbound.version>0.2.0-SNAPSHOT</usermanager.northbound.version>
+    <usermanager.version>0.6.0-SNAPSHOT</usermanager.version>
+    <nsf.version>0.6.0-SNAPSHOT</nsf.version>
+    <web.version>0.6.0-SNAPSHOT</web.version>
+    <yang-ext.version>2013.09.07.8-SNAPSHOT</yang-ext.version>
+    <yang-jmx-generator.version>1.2.0-SNAPSHOT</yang-jmx-generator.version>
+    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
+    <sshd-core.version>0.14.0</sshd-core.version>
     <jmh.version>0.9.7</jmh.version>
     <lmax.version>3.3.0</lmax.version>
   </properties>
@@ -196,7 +191,36 @@
   <dependencyManagement>
     <dependencies>
 
-       <!-- project specific dependencies -->
+
+
+      <!-- yangtools artifacts -->
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>${yangtools.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
+
+      <!-- mdsal artifacts -->
+      <dependency>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
+        <!-- mdsal artifacts -->
+        <dependency>
+          <groupId>org.opendaylight.mdsal.model</groupId>
+          <artifactId>mdsal-model-artifacts</artifactId>
+          <version>${mdsal.model.version}</version>
+          <type>pom</type>
+          <scope>import</scope>
+        </dependency>
+
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-artifacts</artifactId>
@@ -204,17 +228,19 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
+       <!-- project specific dependencies -->
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
+        <artifactId>config-artifacts</artifactId>
+        <version>${config.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
-        <artifactId>netconf-artifacts</artifactId>
-        <version>${netconf.version}</version>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>${mdsal.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -303,31 +329,10 @@
 
       <!-- 3rd party dependencies needed by config-->
       <dependency>
-        <groupId>com.jcabi</groupId>
-        <artifactId>jcabi-maven-slf4j</artifactId>
-        <version>0.8</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.sun.jersey</groupId>
-        <artifactId>jersey-client</artifactId>
-        <version>${jersey.version}</version>
-      </dependency>
-      <!-- Jersey for JAXRS -->
-      <dependency>
-        <groupId>com.sun.jersey</groupId>
-        <artifactId>jersey-core</artifactId>
-        <version>${jersey.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.sun.jersey</groupId>
-        <artifactId>jersey-server</artifactId>
-        <version>${jersey.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.sun.jersey</groupId>
-        <artifactId>jersey-servlet</artifactId>
-        <version>${jersey-servlet.version}</version>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-core</artifactId>
+        <version>3.1.1</version>
+        <scope>provided</scope>
       </dependency>
 
       <dependency>
@@ -952,12 +957,12 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>httpservice-bridge</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.2.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>jolokia-bridge</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.2.0-SNAPSHOT</version>
       </dependency>
       <!-- Karaf Dependencies -->
       <dependency>
@@ -988,22 +993,6 @@
         <version>${networkconfig.bridgedomain.northbound.version}</version>
       </dependency>
 
-      <!--  Neutron -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>networkconfig.neutron</artifactId>
-        <version>${networkconfig.neutron.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>networkconfig.neutron.implementation</artifactId>
-        <version>${networkconfig.neutron.implementation.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>networkconfig.neutron.northbound</artifactId>
-        <version>${networkconfig.neutron.northbound.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>osgi-brandfragment.web</artifactId>
@@ -1187,6 +1176,12 @@
         <version>${yangtools.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>features-test</artifactId>
+        <version>${features.test.version}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>features-yangtools</artifactId>
@@ -1218,22 +1213,14 @@
         <version>1.0.2</version>
       </dependency>
 
-      <!-- yangtools artifacts -->
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools-artifacts</artifactId>
-        <version>${yangtools.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
 
       <dependency>
-        <groupId>org.openexi</groupId>
+        <groupId>openexi</groupId>
         <artifactId>nagasena</artifactId>
         <version>${exi.nagasena.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.openexi</groupId>
+        <groupId>openexi</groupId>
         <artifactId>nagasena-rta</artifactId>
         <version>${exi.nagasena.version}</version>
       </dependency>
@@ -1271,7 +1258,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>commons.logback_settings</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -1306,23 +1293,6 @@
         <type>xml</type>
         <scope>runtime</scope>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>features-netconf-connector</artifactId>
-        <version>${mdsal.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-        <scope>runtime</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>features-neutron</artifactId>
-        <classifier>features</classifier>
-        <type>xml</type>
-        <scope>runtime</scope>
-        <version>${networkconfig.neutron.version}</version>
-      </dependency>
 
       <!-- JMH Benchmark dependencies -->
       <dependency>
@@ -1447,7 +1417,7 @@
             <dependency>
               <groupId>org.opendaylight.controller</groupId>
               <artifactId>commons.logback_settings</artifactId>
-              <version>0.1.0-SNAPSHOT</version>
+              <version>0.2.0-SNAPSHOT</version>
             </dependency>
           </dependencies>
           <executions>
@@ -1650,9 +1620,9 @@
           <version>${yangtools.version}</version>
           <dependencies>
             <dependency>
-              <groupId>org.opendaylight.yangtools</groupId>
+              <groupId>org.opendaylight.mdsal</groupId>
               <artifactId>maven-sal-api-gen-plugin</artifactId>
-              <version>${yangtools.version}</version>
+              <version>0.8.0-SNAPSHOT</version>
               <type>jar</type>
             </dependency>
             <dependency>
@@ -1681,7 +1651,7 @@
           <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>0.1.0-SNAPSHOT</version>
+            <version>0.2.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
         <executions>
@@ -1852,7 +1822,7 @@
     </plugins>
   </reporting>
   <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+    <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <tag>HEAD</tag>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>