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 "On container removal FRM does not uninstall flows"
[controller.git]
/
opendaylight
/
usermanager
/
implementation
/
pom.xml
diff --git
a/opendaylight/usermanager/implementation/pom.xml
b/opendaylight/usermanager/implementation/pom.xml
index 96d6426cc2109654d16e44c87e954f4f6bca0014..25e558eed962764acb357664ccaefd5cada33410 100644
(file)
--- a/
opendaylight/usermanager/implementation/pom.xml
+++ b/
opendaylight/usermanager/implementation/pom.xml
@@
-8,6
+8,11
@@
<version>1.4.0-SNAPSHOT</version>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
<version>1.4.0-SNAPSHOT</version>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
+ <scm>
+ <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+ <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+ <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+ </scm>
<artifactId>usermanager.implementation</artifactId>
<version>0.4.0-SNAPSHOT</version>
<artifactId>usermanager.implementation</artifactId>
<version>0.4.0-SNAPSHOT</version>
@@
-28,7
+33,6
@@
org.opendaylight.controller.sal.core,
org.opendaylight.controller.sal.packet,
org.opendaylight.controller.sal.utils,
org.opendaylight.controller.sal.core,
org.opendaylight.controller.sal.packet,
org.opendaylight.controller.sal.utils,
- org.opendaylight.controller.switchmanager,
org.opendaylight.controller.containermanager,
org.slf4j,
org.eclipse.osgi.framework.console,
org.opendaylight.controller.containermanager,
org.slf4j,
org.eclipse.osgi.framework.console,
@@
-48,7
+52,7
@@
org.opendaylight.controller.usermanager
</Import-Package>
<Export-Package>
org.opendaylight.controller.usermanager
</Import-Package>
<Export-Package>
-<!--
+<!--
org.opendaylight.controller.usermanager,
org.opendaylight.controller.usermanager.internal
-->
org.opendaylight.controller.usermanager,
org.opendaylight.controller.usermanager.internal
-->
@@
-68,15
+72,10
@@
<artifactId>usermanager</artifactId>
<version>0.4.0-SNAPSHOT</version>
</dependency>
<artifactId>usermanager</artifactId>
<version>0.4.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>switchmanager</artifactId>
- <version>0.4.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>containermanager</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>containermanager</artifactId>
- <version>0.
4
.0-SNAPSHOT</version>
+ <version>0.
5
.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>