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 "Persist service references as separate MBeans."
[controller.git]
/
opendaylight
/
forwardingrulesmanager
/
implementation
/
pom.xml
diff --git
a/opendaylight/forwardingrulesmanager/implementation/pom.xml
b/opendaylight/forwardingrulesmanager/implementation/pom.xml
index b236d7f2d0526c81591b852daca95a44f7bd5f40..6b3f5347adb58e7bb31f28d4dae6de262a15db65 100644
(file)
--- a/
opendaylight/forwardingrulesmanager/implementation/pom.xml
+++ b/
opendaylight/forwardingrulesmanager/implementation/pom.xml
@@
-51,9
+51,9
@@
javax.xml.bind.annotation,
javax.xml.bind,
org.apache.felix.dm,
javax.xml.bind.annotation,
javax.xml.bind,
org.apache.felix.dm,
+ org.apache.felix.service.command,
org.osgi.service.component,
org.slf4j,
org.osgi.service.component,
org.slf4j,
- org.eclipse.osgi.framework.console,
org.osgi.framework
</Import-Package>
<Bundle-Activator>
org.osgi.framework
</Import-Package>
<Bundle-Activator>
@@
-74,7
+74,7
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>hosttracker</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>hosttracker</artifactId>
- <version>
0.4.1-SNAPSHOT
</version>
+ <version>
${hosttracker.version}
</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-93,7
+93,7
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
- <version>0.
5.1
-SNAPSHOT</version>
+ <version>0.
7.0
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-105,6
+105,10
@@
<artifactId>forwardingrulesmanager</artifactId>
<version>0.5.0-SNAPSHOT</version>
</dependency>
<artifactId>forwardingrulesmanager</artifactId>
<version>0.5.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>equinoxSDK381</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>