Merge "Bug 2820 - problem to add second TLV with type 127."

diff --combined opendaylight/commons/liblldp/pom.xml
index 1d9cbe3cd0f8d02f58fde1490cbefa06a9c8d5eb,286c68e677e664383ec70cd81bcd9cc898ee37b6..9f4fc8d7e5cc02b585ebccb8671f33dfc3fb2369
--- 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>
@@@ -24,6 -24,15 +24,15 @@@
        <groupId>org.slf4j</groupId>
        <artifactId>slf4j-api</artifactId>
      </dependency>
+     <dependency>
+       <groupId>org.slf4j</groupId>
+       <artifactId>slf4j-log4j12</artifactId>
+       <scope>test</scope>
+     </dependency>
+     <dependency>
+       <groupId>com.google.guava</groupId>
+       <artifactId>guava</artifactId>
+     </dependency>
    </dependencies>
  
    <build>
@@@ -35,8 -44,8 +44,8 @@@
          <configuration>
            <instructions>
              <Import-Package>org.slf4j,
-               org.apache.commons.lang3.builder,
-               org.apache.commons.lang3.tuple
+               org.apache.commons.lang3.*,
+               com.google.common.*
              </Import-Package>
              <Export-Package>
                org.opendaylight.controller.liblldp</Export-Package>