<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>
<classifier>features</classifier>
<type>xml</type>
</dependency>
+ -->
<dependency>
<groupId>org.opendaylight.dlux</groupId>
<artifactId>features-dlux</artifactId>
<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>
<classifier>features</classifier>
<type>xml</type>
</dependency>
- <dependency>
+ <!-- Depends on NIC, which is commented-out
+ <dependency>
+ <groupId>org.opendaylight.netvirt</groupId>
+ <artifactId>vpnservice-features</artifactId>
+ <version>${feature.netvirt.vpnservice.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </dependency>
+ -->
+ <dependency>
<groupId>org.opendaylight.netide</groupId>
<artifactId>netide-features</artifactId>
<version>${feature.netide.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
+ <!-- NIC merge jobs are failing due to getTableFeatures() method not being supported by OpenFlowPlugin anymore
<dependency>
<groupId>org.opendaylight.nic</groupId>
<artifactId>features-nic</artifactId>
<classifier>features</classifier>
<type>xml</type>
</dependency>
-<!-- Issue with of-config merge requires this line commented out:
+ -->
+ <dependency>
+ <groupId>org.opendaylight.ocpplugin</groupId>
+ <artifactId>features-ocpplugin</artifactId>
+ <version>${feature.ocpplugin.version}</version>
+ <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>
<classifier>features</classifier>
<type>xml</type>
</dependency>
--->
+ -->
<dependency>
<groupId>org.opendaylight.ofextensions.circuitsw</groupId>
<artifactId>circuitsw-features</artifactId>
<classifier>features</classifier>
<type>xml</type>
</dependency>
- <dependency>
- <groupId>org.opendaylight.vpnservice</groupId>
- <artifactId>vpnservice-features</artifactId>
- <version>${feature.vpnservice.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- </dependency>
<dependency>
<groupId>org.opendaylight.yang-push</groupId>
<artifactId>yangpush-features</artifactId>