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
Bug 6287 - OFCONFIG Missing from Distribution Feature Index
[integration/distribution.git]
/
features-index
/
pom.xml
diff --git
a/features-index/pom.xml
b/features-index/pom.xml
index 20d9ada63550baf258414fc42e49896571558495..008995cebd82e828631db6d97f0803fdc017440f 100644
(file)
--- a/
features-index/pom.xml
+++ b/
features-index/pom.xml
@@
-155,7
+155,6
@@
<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>
@@
-177,7
+176,6
@@
<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>
@@
-185,6
+183,13
@@
<classifier>features</classifier>
<type>xml</type>
</dependency>
<classifier>features</classifier>
<type>xml</type>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.eman</groupId>
+ <artifactId>eman-features</artifactId>
+ <version>${feature.eman.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </dependency>
<dependency>
<groupId>org.opendaylight.faas</groupId>
<artifactId>features-faas</artifactId>
<dependency>
<groupId>org.opendaylight.faas</groupId>
<artifactId>features-faas</artifactId>
@@
-339,7
+344,6
@@
<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>
@@
-347,7
+351,6
@@
<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>
@@
-490,7
+493,6
@@
<classifier>features</classifier>
<type>xml</type>
</dependency>
<classifier>features</classifier>
<type>xml</type>
</dependency>
- <!-- Commenting due to faulty feature POM file
<dependency>
<groupId>org.opendaylight.usecplugin</groupId>
<artifactId>usecplugin-features</artifactId>
<dependency>
<groupId>org.opendaylight.usecplugin</groupId>
<artifactId>usecplugin-features</artifactId>
@@
-498,7
+500,6
@@
<classifier>features</classifier>
<type>xml</type>
</dependency>
<classifier>features</classifier>
<type>xml</type>
</dependency>
- -->
<dependency>
<groupId>org.opendaylight.vtn</groupId>
<artifactId>features-vtn-manager</artifactId>
<dependency>
<groupId>org.opendaylight.vtn</groupId>
<artifactId>features-vtn-manager</artifactId>