Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bug 2820 - problem to add second TLV with type 127."
[controller.git]
/
opendaylight
/
commons
/
liblldp
/
pom.xml
diff --git
a/opendaylight/commons/liblldp/pom.xml
b/opendaylight/commons/liblldp/pom.xml
index 1551041edbd28417e87f4c231ada388a9c3ca4c6..9f4fc8d7e5cc02b585ebccb8671f33dfc3fb2369 100644
(file)
--- a/
opendaylight/commons/liblldp/pom.xml
+++ b/
opendaylight/commons/liblldp/pom.xml
@@
-4,12
+4,12
@@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
- <version>1.
4.2
-SNAPSHOT</version>
+ <version>1.
6.0
-SNAPSHOT</version>
<relativePath>../opendaylight</relativePath>
</parent>
<artifactId>liblldp</artifactId>
<relativePath>../opendaylight</relativePath>
</parent>
<artifactId>liblldp</artifactId>
- <version>0.
8.1
-SNAPSHOT</version>
+ <version>0.
10.0
-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<packaging>bundle</packaging>
<dependencies>
<dependency>
@@
-24,6
+24,15
@@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<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>
</dependencies>
<build>
@@
-35,8
+44,8
@@
<configuration>
<instructions>
<Import-Package>org.slf4j,
<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>
</Import-Package>
<Export-Package>
org.opendaylight.controller.liblldp</Export-Package>