Code Review
/
openflowplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update MRI projects for Aluminium
[openflowplugin.git]
/
libraries
/
liblldp
/
pom.xml
diff --git
a/libraries/liblldp/pom.xml
b/libraries/liblldp/pom.xml
index a5720baf12948d3d9ae52de69a38256d50c73572..e9768e91a1934ba6c23a477676c937f0aa587cd7 100644
(file)
--- a/
libraries/liblldp/pom.xml
+++ b/
libraries/liblldp/pom.xml
@@
-4,8
+4,9
@@
<parent>
<groupId>org.opendaylight.openflowplugin</groupId>
<parent>
<groupId>org.opendaylight.openflowplugin</groupId>
- <artifactId>libraries</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <artifactId>openflowplugin-parent</artifactId>
+ <version>0.11.0-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
</parent>
<groupId>org.opendaylight.openflowplugin.libraries</groupId>
</parent>
<groupId>org.opendaylight.openflowplugin.libraries</groupId>
@@
-14,8
+15,9
@@
<dependencies>
<dependency>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@
-35,8
+37,8
@@
<artifactId>guava</artifactId>
</dependency>
<dependency>
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>ja
vax
.xml.bind</groupId>
- <artifactId>ja
xb
-api</artifactId>
+ <groupId>ja
karta
.xml.bind</groupId>
+ <artifactId>ja
karta.xml.bind
-api</artifactId>
</dependency>
</dependencies>
</dependency>
</dependencies>
@@
-49,7
+51,8
@@
<configuration>
<instructions>
<Export-Package>
<configuration>
<instructions>
<Export-Package>
- org.opendaylight.openflowplugin.libraries.liblldp</Export-Package>
+ org.opendaylight.openflowplugin.libraries.liblldp
+ </Export-Package>
</instructions>
</configuration>
</plugin>
</instructions>
</configuration>
</plugin>