Merge "BUG 624 - Make netconf TCP port optional."

diff --combined opendaylight/commons/opendaylight/pom.xml
index 80be29570dbb6010fd6031a6643cb5ae9edad54c,e88e39a61e5dd7784d8d336cf84f0a3086c87112..077b452f0ac96623c4b9f445d91445f9cae57cd1
--- 1/opendaylight/commons/opendaylight/pom.xml
--- 2/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@@ -88,18 -88,14 +88,18 @@@
      <java.version.source>1.7</java.version.source>
      <java.version.target>1.7</java.version.target>
      <javassist.version>3.17.1-GA</javassist.version>
 +    <javax.annotation.version>1.2</javax.annotation.version>
      <!-- Third party version -->
      <jersey-servlet.version>1.17</jersey-servlet.version>
      <jersey.version>1.17</jersey.version>
 +    <jersey2.publisher.version>4.0</jersey2.publisher.version>
 +    <jersey2.version>2.8</jersey2.version>
      <jettison.version>1.3.3</jettison.version>
      <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
      <jolokia.version>1.1.4</jolokia.version>
      <jsr305.api.version>2.0.1</jsr305.api.version>
      <jsr311.api.version>1.1.1</jsr311.api.version>
 +    <jsr311.v2.api.version>2.0</jsr311.v2.api.version>
      <junit.version>4.8.1</junit.version>
      <karaf.version>3.0.1</karaf.version>
      <logback.version>1.0.9</logback.version>
@@@ -111,7 -107,7 +111,7 @@@
      <mdsal.version>1.1-SNAPSHOT</mdsal.version>
      <mockito.version>1.9.5</mockito.version>
      <netconf.version>0.2.5-SNAPSHOT</netconf.version>
 -    <netty.version>4.0.17.Final</netty.version>
 +    <netty.version>4.0.19.Final</netty.version>
      <networkconfig.bridgedomain.northbound.version>0.0.3-SNAPSHOT</networkconfig.bridgedomain.northbound.version>
      <networkconfig.neutron.implementation.version>0.4.2-SNAPSHOT</networkconfig.neutron.implementation.version>
      <networkconfig.neutron.northbound.version>0.4.2-SNAPSHOT</networkconfig.neutron.northbound.version>
@@@ -950,6 -946,11 +950,11 @@@
          <version>${netconf.version}</version>
          <type>test-jar</type>
        </dependency>
+       <dependency>
+         <groupId>org.opendaylight.controller</groupId>
+         <artifactId>netconf-tcp</artifactId>
+         <version>${netconf.version}</version>
+       </dependency>
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>netconf-util</artifactId>