Merge "Bug 2820 - LLDP TLV support and testing"

diff --combined opendaylight/commons/liblldp/pom.xml
index 9f4fc8d7e5cc02b585ebccb8671f33dfc3fb2369,5e14c92ee78de72c3a3e1b13a2c2ca53159a4bc8..01900b421b51b2b6b8191a8b481590b1392bc8a9
--- 1/opendaylight/commons/liblldp/pom.xml
--- 2/opendaylight/commons/liblldp/pom.xml
+++ b/opendaylight/commons/liblldp/pom.xml
@@@ -4,12 -4,12 +4,12 @@@
    <parent>
      <groupId>org.opendaylight.controller</groupId>
      <artifactId>commons.opendaylight</artifactId>
 -    <version>1.5.0-SNAPSHOT</version>
 +    <version>1.6.0-SNAPSHOT</version>
      <relativePath>../opendaylight</relativePath>
    </parent>
  
    <artifactId>liblldp</artifactId>
 -  <version>0.9.0-SNAPSHOT</version>
 +  <version>0.10.0-SNAPSHOT</version>
    <packaging>bundle</packaging>
    <dependencies>
      <dependency>
@@@ -27,7 -27,6 +27,6 @@@
      <dependency>
        <groupId>org.slf4j</groupId>
        <artifactId>slf4j-log4j12</artifactId>
-       <scope>test</scope>
      </dependency>
      <dependency>
        <groupId>com.google.guava</groupId>