X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fcommons%2Fopendaylight%2Fpom.xml;h=929a14abccaaf4159719354e9e606aec15fbbde0;hp=735c5f1eb2e27f267a068af4f445e5815587f74c;hb=1a8051a1778d44afc86e890e143db46a898b39a8;hpb=5d6261d886f179bcde600227f9d4c5f815556994

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 735c5f1eb2..929a14abcc 100644
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -1,48 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
+
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath></relativePath>
   </parent>
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>commons.opendaylight</artifactId>
-  <version>1.6.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
-    <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
-    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
-    <akka.version>2.3.14</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>
+    <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
+    <appauth.version>0.8.0-SNAPSHOT</appauth.version>
+    <archetype-app-northbound>0.4.0-SNAPSHOT</archetype-app-northbound>
+    <arphandler.version>0.9.0-SNAPSHOT</arphandler.version>
     <!-- Plugin Versions -->
-    <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>
+    <bundlescanner.api.version>0.8.0-SNAPSHOT</bundlescanner.api.version>
+    <bundlescanner.implementation.version>0.8.0-SNAPSHOT</bundlescanner.implementation.version>
+    <bundlescanner.version>0.8.0-SNAPSHOT</bundlescanner.version>
+    <clustering.services.version>0.9.0-SNAPSHOT</clustering.services.version>
+    <clustering.services_implementation.version>0.8.0-SNAPSHOT</clustering.services_implementation.version>
+    <clustering.stub.version>0.8.0-SNAPSHOT</clustering.stub.version>
+    <clustering.test.version>0.8.0-SNAPSHOT</clustering.test.version>
+    <commmons.northbound.version>0.8.0-SNAPSHOT</commmons.northbound.version>
     <!-- Third Party Versions -->
     <codahale.metrics.version>3.0.1</codahale.metrics.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.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>
-    <config.version>0.4.0-SNAPSHOT</config.version>
-    <aaa.version>0.3.0-SNAPSHOT</aaa.version>
+    <commons.checkstyle.version>0.4.0-SNAPSHOT</commons.checkstyle.version>
+    <commons.httpclient.version>0.5.0-SNAPSHOT</commons.httpclient.version>
+    <commons.logback_settings.version>0.4.0-SNAPSHOT</commons.logback_settings.version>
+    <commons.opendaylight.commons.httpclient>0.5.0-SNAPSHOT</commons.opendaylight.commons.httpclient>
+    <commons.opendaylight.concepts.version>0.9.0-SNAPSHOT</commons.opendaylight.concepts.version>
+    <commons.opendaylight.version>1.8.0-SNAPSHOT</commons.opendaylight.version>
+    <commons.parent.version>1.4.0-SNAPSHOT</commons.parent.version>
+    <commons.httpclient.version>0.5.0-SNAPSHOT</commons.httpclient.version>
+    <concepts.version>0.9.0-SNAPSHOT</concepts.version>
+    <config.version>0.6.0-SNAPSHOT</config.version>
+    <aaa.version>0.5.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>
@@ -52,77 +50,80 @@
     <config.toaster.configfile>03-toaster-sample.xml</config.toaster.configfile>
     <config.restconf.configfile>10-rest-connector.xml</config.restconf.configfile>
 
-    <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>
+    <configuration.implementation.version>0.8.0-SNAPSHOT</configuration.implementation.version>
+    <configuration.version>0.8.0-SNAPSHOT</configuration.version>
+    <connectionmanager.version>0.5.0-SNAPSHOT</connectionmanager.version>
+    <containermanager.it.version>0.9.0-SNAPSHOT</containermanager.it.version>
+    <containermanager.northbound.version>0.8.0-SNAPSHOT</containermanager.northbound.version>
+    <containermanager.shell.version>0.9.0-SNAPSHOT</containermanager.shell.version>
+    <containermanager.version>0.9.0-SNAPSHOT</containermanager.version>
+    <controllermanager.northbound.version>0.4.0-SNAPSHOT</controllermanager.northbound.version>
+    <devices.web.version>0.8.0-SNAPSHOT</devices.web.version>
+    <dummy-console.version>1.5.0-SNAPSHOT</dummy-console.version>
     <config.statistics.manager.configfile>30-statistics-manager.xml</config.statistics.manager.configfile>
 
     <!-- OpenEXI third party lib for netconf-->
     <exi.nagasena.version>0000.0002.0053.0</exi.nagasena.version>
-    <features.test.version>1.6.0-SNAPSHOT</features.test.version>
-    <filtervalve.version>1.6.0-SNAPSHOT</filtervalve.version>
+    <features.test.version>1.8.0-SNAPSHOT</features.test.version>
+    <filtervalve.version>1.8.0-SNAPSHOT</filtervalve.version>
     <findbugs.maven.plugin.version>2.4.0</findbugs.maven.plugin.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>
+    <flowprogrammer.northbound.version>0.8.0-SNAPSHOT</flowprogrammer.northbound.version>
+    <flows.web.version>0.8.0-SNAPSHOT</flows.web.version>
+    <forwarding.staticrouting>0.9.0-SNAPSHOT</forwarding.staticrouting>
+    <forwarding.staticrouting.northbound.version>0.8.0-SNAPSHOT</forwarding.staticrouting.northbound.version>
+    <forwardingrulesmanager.implementation.version>0.8.0-SNAPSHOT</forwardingrulesmanager.implementation.version>
+    <forwardingrulesmanager.version>0.10.0-SNAPSHOT</forwardingrulesmanager.version>
+    <hosttracker.api.version>0.9.0-SNAPSHOT</hosttracker.api.version>
+    <hosttracker.implementation.version>0.9.0-SNAPSHOT</hosttracker.implementation.version>
+    <hosttracker.northbound.version>0.8.0-SNAPSHOT</hosttracker.northbound.version>
+    <hosttracker.shell.version>1.4.0-SNAPSHOT</hosttracker.shell.version>
+    <hosttracker_new.api.version>0.8.0-SNAPSHOT</hosttracker_new.api.version>
+    <hosttracker_new.implementation.version>0.8.0-SNAPSHOT</hosttracker_new.implementation.version>
+    <httpservice-bridge.northbound.version>0.4.0-SNAPSHOT</httpservice-bridge.northbound.version>
+    <ietf-inet-types.version>1.2.0-SNAPSHOT</ietf-inet-types.version>
+    <ietf-restconf.version>2013.10.19.10-SNAPSHOT</ietf-restconf.version>
+    <ietf-topology.version>2013.10.21.10-SNAPSHOT</ietf-topology.version>
+    <ietf-yang-types.version>2013.07.15.10-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.2.0-SNAPSHOT</jolokia-bridge.version>
-    <karaf.branding.version>1.2.0-SNAPSHOT</karaf.branding.version>
+
+    <!-- Path prefix where we generate configuration subsystem bindings -->
+    <jmxGeneratorPath>target/generated-sources/config-binding</jmxGeneratorPath>
+
+    <jolokia-bridge.version>0.4.0-SNAPSHOT</jolokia-bridge.version>
+    <karaf.branding.version>1.8.0-SNAPSHOT</karaf.branding.version>
     <karaf.shell.version>${karaf.version}</karaf.shell.version>
-    <leveldb.version>0.7</leveldb.version>
-    <leveldbjni.version>1.8-odl</leveldbjni.version>
     <lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
-    <logging.bridge.version>0.6.0-SNAPSHOT</logging.bridge.version>
+    <logging.bridge.version>0.8.0-SNAPSHOT</logging.bridge.version>
     <maven.plugin.api.version>3.0.5</maven.plugin.api.version>
-    <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
-    <networkconfig.bridgedomain.northbound.version>0.2.0-SNAPSHOT</networkconfig.bridgedomain.northbound.version>
+    <!-- mdsal version for controller, not mdsal -->
+    <mdsal.version>1.5.0-SNAPSHOT</mdsal.version>
+    <networkconfig.bridgedomain.northbound.version>0.4.0-SNAPSHOT</networkconfig.bridgedomain.northbound.version>
     <!-- ODL repository / plugin repository -->
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
-    <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>
-    <protobuf.version>2.5.0</protobuf.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.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.6.0-SNAPSHOT</security.version>
-    <karaf.security.version>0.6.0-SNAPSHOT</karaf.security.version>
+    <northbound.commons.version>0.8.0-SNAPSHOT</northbound.commons.version>
+    <northbound.hosttracker.version>1.8.0-SNAPSHOT</northbound.hosttracker.version>
+    <northbound.jolokia.version>1.8.0-SNAPSHOT</northbound.jolokia.version>
+    <opendaylight-l2-types.version>2013.08.27.10-SNAPSHOT</opendaylight-l2-types.version>
+    <osgi-brandfragment.web.version>0.4.0-SNAPSHOT</osgi-brandfragment.web.version>
+    <protocol-framework.version>0.9.0-SNAPSHOT</protocol-framework.version>
+    <protocol_plugins.openflow.version>0.8.0-SNAPSHOT</protocol_plugins.openflow.version>
+    <protocol_plugins.stub.version>0.8.0-SNAPSHOT</protocol_plugins.stub.version>
+    <routing.dijkstra_implementation.version>0.8.0-SNAPSHOT</routing.dijkstra_implementation.version>
+    <sal.connection.version>0.5.0-SNAPSHOT</sal.connection.version>
+    <sal.implementation.version>0.8.0-SNAPSHOT</sal.implementation.version>
+    <sal.networkconfiguration.version>0.4.0-SNAPSHOT</sal.networkconfiguration.version>
+    <sal.version>0.12.0-SNAPSHOT</sal.version>
+
+    <!-- Path prefix where we generate YANG Java Bindings. This really should be inherited
+         from mdsal's binding-parent -->
+    <salGeneratorPath>target/generated-sources/mdsal-binding</salGeneratorPath>
+
+    <samples.loadbalancer>0.9.0-SNAPSHOT</samples.loadbalancer>
+    <samples.loadbalancer.northbound.version>0.8.0-SNAPSHOT</samples.loadbalancer.northbound.version>
+    <samples.simpleforwarding.version>0.8.0-SNAPSHOT</samples.simpleforwarding.version>
+    <sanitytest.version>0.8.0-SNAPSHOT</sanitytest.version>
+    <security.version>0.8.0-SNAPSHOT</security.version>
+    <karaf.security.version>0.8.0-SNAPSHOT</karaf.security.version>
     <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
     <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
     <!-- Sonar properties using jacoco to retrieve integration test results -->
@@ -132,29 +133,27 @@
     <sonar.jacoco.reportPath>target/code-coverage/jacoco.exec</sonar.jacoco.reportPath>
     <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
     <sonar.skippedModules>org.openflow.openflowj,net.sf.jung2,org.opendaylight.controller.protobuff.messages</sonar.skippedModules>
-    <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>
-    <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.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.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>
+    <statistics.northbound.version>0.8.0-SNAPSHOT</statistics.northbound.version>
+    <statisticsmanager.implementation.version>0.8.0-SNAPSHOT</statisticsmanager.implementation.version>
+    <statisticsmanager.version>0.9.0-SNAPSHOT</statisticsmanager.version>
+    <subnets.northbound.version>0.8.0-SNAPSHOT</subnets.northbound.version>
+    <switchmanager.api.version>0.11.0-SNAPSHOT</switchmanager.api.version>
+    <switchmanager.implementation.version>0.8.0-SNAPSHOT</switchmanager.implementation.version>
+    <switchmanager.northbound.version>0.8.0-SNAPSHOT</switchmanager.northbound.version>
+    <testvm.argLine>-Xmx1024m</testvm.argLine>
+    <topology.northbound.version>0.8.0-SNAPSHOT</topology.northbound.version>
+    <topology.web.version>0.8.0-SNAPSHOT</topology.web.version>
+    <topologymanager.version>0.8.0-SNAPSHOT</topologymanager.version>
+    <topologymanager.shell.version>1.4.0-SNAPSHOT</topologymanager.shell.version>
+    <troubleshoot.web.version>0.8.0-SNAPSHOT</troubleshoot.web.version>
+    <usermanager.implementation.version>0.8.0-SNAPSHOT</usermanager.implementation.version>
+    <usermanager.northbound.version>0.4.0-SNAPSHOT</usermanager.northbound.version>
+    <usermanager.version>0.8.0-SNAPSHOT</usermanager.version>
+    <nsf.version>0.8.0-SNAPSHOT</nsf.version>
+    <web.version>0.8.0-SNAPSHOT</web.version>
+    <yang-ext.version>2013.09.07.10-SNAPSHOT</yang-ext.version>
+    <yang-jmx-generator.version>1.4.0-SNAPSHOT</yang-jmx-generator.version>
+    <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
     <jmh.version>0.9.7</jmh.version>
   </properties>
 
@@ -177,7 +176,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -224,12 +223,6 @@
         <version>${codahale.metrics.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>com.lmax</groupId>
-        <artifactId>disruptor</artifactId>
-        <version>3.3.0</version>
-      </dependency>
-
       <!-- 3rd party dependencies needed by config-->
       <dependency>
         <groupId>org.apache.maven</groupId>
@@ -238,44 +231,6 @@
         <scope>provided</scope>
       </dependency>
 
-      <dependency>
-        <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-actor_${scala.version}</artifactId>
-        <version>${akka.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-cluster_${scala.version}</artifactId>
-        <version>${akka.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-persistence-experimental_${scala.version}</artifactId>
-        <version>${akka.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-remote_${scala.version}</artifactId>
-        <version>${akka.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-testkit_${scala.version}</artifactId>
-        <version>${akka.version}</version>
-      </dependency>
-        <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-osgi_${scala.version}</artifactId>
-            <version>${akka.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-slf4j_${scala.version}</artifactId>
-            <version>${akka.version}</version>
-        </dependency>
       <dependency>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
@@ -286,23 +241,6 @@
         <artifactId>gmaven-runtime-2.0</artifactId>
         <version>1.5</version>
       </dependency>
-      <dependency>
-        <groupId>org.eclipse</groupId>
-        <artifactId>jdt</artifactId>
-        <version>3.3.0-v20070607-1300</version>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.equinox</groupId>
-        <artifactId>app</artifactId>
-        <version>1.0.0-v20070606</version>
-      </dependency>
-
-      <!-- equinox http service bridge -->
-      <dependency>
-        <groupId>org.eclipse.jdt</groupId>
-        <artifactId>core</artifactId>
-        <version>3.3.0-v_771</version>
-      </dependency>
 
       <!-- md-sal -->
       <dependency>
@@ -495,16 +433,16 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>httpservice-bridge</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+        <version>0.4.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>jolokia-bridge</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+        <version>0.4.0-SNAPSHOT</version>
       </dependency>
       <!-- Karaf Dependencies -->
       <dependency>
-        <groupId>org.opendaylight.controller</groupId>
+        <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf.branding</artifactId>
         <version>${karaf.branding.version}</version>
       </dependency>
@@ -762,15 +700,10 @@
         <artifactId>reflections</artifactId>
         <version>0.9.9-RC1</version>
       </dependency>
-      <dependency>
-        <groupId>org.scala-lang</groupId>
-        <artifactId>scala-library</artifactId>
-        <version>${scala.version}.1</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>commons.logback_settings</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+        <version>0.4.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -890,7 +823,7 @@
             <dependency>
               <groupId>org.opendaylight.controller</groupId>
               <artifactId>commons.logback_settings</artifactId>
-              <version>0.2.0-SNAPSHOT</version>
+              <version>0.4.0-SNAPSHOT</version>
             </dependency>
           </dependencies>
           <executions>
@@ -987,19 +920,6 @@
                     </execute>
                   </action>
                 </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <versionRange>[2.0,)</versionRange>
-                    <goals>
-                      <goal>check</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore></ignore>
-                  </action>
-                </pluginExecution>
                 <pluginExecution>
                   <pluginExecutionFilter>
                     <groupId>org.opendaylight.yangtools</groupId>
@@ -1095,7 +1015,7 @@
             <dependency>
               <groupId>org.opendaylight.mdsal</groupId>
               <artifactId>maven-sal-api-gen-plugin</artifactId>
-              <version>0.8.0-SNAPSHOT</version>
+              <version>${mdsal.model.version}</version>
               <type>jar</type>
             </dependency>
             <dependency>
@@ -1124,7 +1044,7 @@
           <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>0.2.0-SNAPSHOT</version>
+            <version>0.4.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
         <executions>
@@ -1268,32 +1188,9 @@
           <linkJavadoc>true</linkJavadoc>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>${projectinfo}</version>
-        <configuration>
-          <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
-          <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>index</report>
-              <report>project-team</report>
-              <report>license</report>
-              <report>mailing-list</report>
-              <report>plugin-management</report>
-              <report>cim</report>
-              <report>issue-tracking</report>
-              <report>scm</report>
-              <report>summary</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
     </plugins>
   </reporting>
+
   <scm>
     <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
@@ -1327,18 +1224,6 @@
   </distributionManagement>
 
   <profiles>
-    <profile>
-      <id>IDE</id>
-      <activation>
-        <property>
-          <name>m2e.version</name>
-        </property>
-      </activation>
-      <build>
-        <!-- Put the IDE's build output in a folder other than target, so that IDE builds don't interact with Maven builds -->
-        <directory>target-ide</directory>
-      </build>
-    </profile>
     <profile>
       <id>viewbuild</id>
       <activation>