Code Review
/
integration
/
distribution.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove of-config features from master distribution
[integration/distribution.git]
/
features-index
/
pom.xml
diff --git
a/features-index/pom.xml
b/features-index/pom.xml
index 3129f0db34aeb8ec8ce7974c8390d003d7b2112a..91ac1457ed50493eee0e8e85dc4ad5ae98a7a51d 100644
(file)
--- a/
features-index/pom.xml
+++ b/
features-index/pom.xml
@@
-257,6
+257,7
@@
<classifier>features</classifier>
<type>xml</type>
</dependency>
<classifier>features</classifier>
<type>xml</type>
</dependency>
+<!-- Issue with of-config merge requires this line commented out:
<dependency>
<groupId>org.opendaylight.of-config</groupId>
<artifactId>features-of-config</artifactId>
<dependency>
<groupId>org.opendaylight.of-config</groupId>
<artifactId>features-of-config</artifactId>
@@
-264,6
+265,7
@@
<classifier>features</classifier>
<type>xml</type>
</dependency>
<classifier>features</classifier>
<type>xml</type>
</dependency>
+-->
<dependency>
<groupId>org.opendaylight.ofextensions.circuitsw</groupId>
<artifactId>circuitsw-features</artifactId>
<dependency>
<groupId>org.opendaylight.ofextensions.circuitsw</groupId>
<artifactId>circuitsw-features</artifactId>