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
Comment-out NIC as its artifacts are not being built
[integration/distribution.git]
/
features-index
/
pom.xml
diff --git
a/features-index/pom.xml
b/features-index/pom.xml
index 800a1b8372fa408658caae2bc6a4acb71ff2043f..da2a9ddd260e3c84ca09919df94d34d70826fa4d 100644
(file)
--- a/
features-index/pom.xml
+++ b/
features-index/pom.xml
@@
-243,6
+243,7
@@
<classifier>features</classifier>
<type>xml</type>
</dependency>
<classifier>features</classifier>
<type>xml</type>
</dependency>
+ <!-- Depends on NIC, which is commented-out
<dependency>
<groupId>org.opendaylight.netvirt</groupId>
<artifactId>vpnservice-features</artifactId>
<dependency>
<groupId>org.opendaylight.netvirt</groupId>
<artifactId>vpnservice-features</artifactId>
@@
-250,6
+251,7
@@
<classifier>features</classifier>
<type>xml</type>
</dependency>
<classifier>features</classifier>
<type>xml</type>
</dependency>
+ -->
<dependency>
<groupId>org.opendaylight.netide</groupId>
<artifactId>netide-features</artifactId>
<dependency>
<groupId>org.opendaylight.netide</groupId>
<artifactId>netide-features</artifactId>
@@
-264,6
+266,7
@@
<classifier>features</classifier>
<type>xml</type>
</dependency>
<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>
<dependency>
<groupId>org.opendaylight.nic</groupId>
<artifactId>features-nic</artifactId>
@@
-271,6
+274,7
@@
<classifier>features</classifier>
<type>xml</type>
</dependency>
<classifier>features</classifier>
<type>xml</type>
</dependency>
+ -->
<dependency>
<groupId>org.opendaylight.ocpplugin</groupId>
<artifactId>features-ocpplugin</artifactId>
<dependency>
<groupId>org.opendaylight.ocpplugin</groupId>
<artifactId>features-ocpplugin</artifactId>
@@
-278,7
+282,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:
+
<!-- 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>
@@
-286,7
+290,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>