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 DIDM from distribution
[integration/distribution.git]
/
features-index
/
pom.xml
diff --git
a/features-index/pom.xml
b/features-index/pom.xml
index da2a9ddd260e3c84ca09919df94d34d70826fa4d..170364bae4e85c690141c0c0895a21a158421c8c 100644
(file)
--- a/
features-index/pom.xml
+++ b/
features-index/pom.xml
@@
-131,6
+131,7
@@
<classifier>features</classifier>
<type>xml</type>
</dependency>
<classifier>features</classifier>
<type>xml</type>
</dependency>
+ <!-- DIDM merge jobs are failing due to getTableFeatures() method moved in OpenFlowPlugin (new design)
<dependency>
<groupId>org.opendaylight.didm</groupId>
<artifactId>features-didm</artifactId>
<dependency>
<groupId>org.opendaylight.didm</groupId>
<artifactId>features-didm</artifactId>
@@
-152,6
+153,7
@@
<classifier>features</classifier>
<type>xml</type>
</dependency>
<classifier>features</classifier>
<type>xml</type>
</dependency>
+ -->
<dependency>
<groupId>org.opendaylight.dlux</groupId>
<artifactId>features-dlux</artifactId>
<dependency>
<groupId>org.opendaylight.dlux</groupId>
<artifactId>features-dlux</artifactId>
@@
-166,6
+168,13
@@
<classifier>features</classifier>
<type>xml</type>
</dependency>
<classifier>features</classifier>
<type>xml</type>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.genius</groupId>
+ <artifactId>genius-features</artifactId>
+ <version>${feature.genius.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </dependency>
<dependency>
<groupId>org.opendaylight.groupbasedpolicy</groupId>
<artifactId>features-groupbasedpolicy</artifactId>
<dependency>
<groupId>org.opendaylight.groupbasedpolicy</groupId>
<artifactId>features-groupbasedpolicy</artifactId>