Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Reverting because it caused instability to the northbound, wondering why verify didn...
[controller.git]
/
opendaylight
/
distribution
/
opendaylight
/
pom.xml
diff --git
a/opendaylight/distribution/opendaylight/pom.xml
b/opendaylight/distribution/opendaylight/pom.xml
index e6871afa772860e05ba22db915005823af7d6243..abf508efc2bb308f2727f69d9e4d8cc9b80da35e 100644
(file)
--- a/
opendaylight/distribution/opendaylight/pom.xml
+++ b/
opendaylight/distribution/opendaylight/pom.xml
@@
-5,10
+5,10
@@
<prerequisites>
<maven>3.0</maven>
</prerequisites>
<prerequisites>
<maven>3.0</maven>
</prerequisites>
-
<scm>
<scm>
- <connection>scm:git:
https://git.opendaylight.org/gerrit/p
/controller.git</connection>
+ <connection>scm:git:
ssh://git.opendaylight.org:29418
/controller.git</connection>
<developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
<developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+ <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
</scm>
<parent>
<groupId>org.opendaylight.controller</groupId>
</scm>
<parent>
<groupId>org.opendaylight.controller</groupId>
@@
-67,6
+67,7
@@
<module>../../../third-party/openflowj</module>
<module>../../../third-party/net.sf.jung2</module>
<module>../../../third-party/jersey-servlet</module>
<module>../../../third-party/openflowj</module>
<module>../../../third-party/net.sf.jung2</module>
<module>../../../third-party/jersey-servlet</module>
+ <module>../../../third-party/commons/thirdparty</module>
<!-- SAL bundles -->
<module>../../sal/api</module>
<!-- SAL bundles -->
<module>../../sal/api</module>
@@
-75,6
+76,11
@@
<!-- SAL Extension bundles -->
<module>../../sal/connection/api</module>
<module>../../sal/connection/implementation</module>
<!-- SAL Extension bundles -->
<module>../../sal/connection/api</module>
<module>../../sal/connection/implementation</module>
+ <module>../../sal/networkconfiguration/api</module>
+ <module>../../sal/networkconfiguration/implementation</module>
+
+ <!-- MD-SAL bundles -->
+ <module>../../sal/yang-prototype</module>
<!-- Web bundles -->
<module>../../web/root</module>
<!-- Web bundles -->
<module>../../web/root</module>
@@
-92,6
+98,7
@@
<module>../../northbound/hosttracker</module>
<module>../../northbound/subnets</module>
<module>../../northbound/switchmanager</module>
<module>../../northbound/hosttracker</module>
<module>../../northbound/subnets</module>
<module>../../northbound/switchmanager</module>
+ <module>../../northbound/networkconfiguration/bridgedomain</module>
<!-- Northbound integration tests -->
<module>../../northbound/integrationtest</module>
<!-- Northbound integration tests -->
<module>../../northbound/integrationtest</module>
@@
-106,9
+113,13
@@
<module>../../samples/simpleforwarding</module>
<module>../../samples/loadbalancer</module>
<module>../../samples/northbound/loadbalancer</module>
<module>../../samples/simpleforwarding</module>
<module>../../samples/loadbalancer</module>
<module>../../samples/northbound/loadbalancer</module>
+
+ <!-- Parents -->
<module>../../commons/concepts</module>
<module>../../commons/integrationtest</module>
<module>../../commons/concepts</module>
<module>../../commons/integrationtest</module>
-
+ <module>../../commons/checkstyle</module>
+ <module>../../commons/opendaylight</module>
+ <module>../../commons/parent</module>
</modules>
<build>
</modules>
<build>