Code Review / integration / distribution.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Adjust features in master
[integration/distribution.git] / features / singles / odl-integration-all / pom.xml
diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index 4b2e3dd7213d6feab7b65555d1372e89824016ee..cf93b0aaf7db72c47d55526870a4f15655c05ac7 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -61,7 +61,7 @@
         <!-- External single feature dependencies in alphabetical order -->
 
         <!-- BIER -->
-        <!-- Comment out because of SFT memory problem
+        <!-- Comment due to fail merge job
         <dependency>
             <groupId>org.opendaylight.bier</groupId>
             <artifactId>odl-bier-all</artifactId>
@@ -70,20 +70,6 @@
         </dependency>
         -->
 
-        <!-- Cardinal -->
-        <dependency>
-            <groupId>org.opendaylight.cardinal</groupId>
-            <artifactId>odl-cardinal-ui</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.cardinal</groupId>
-            <artifactId>odl-cardinal</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
         <!-- COE -->
         <dependency>
             <groupId>org.opendaylight.coe</groupId>
@@ -110,27 +96,120 @@
             <classifier>features</classifier>
         </dependency>
 
-        <!-- L2switch -->
+        <!-- GROUPBASEDPOLICY or GBP-->
+        <!-- Commenting this feature because SFT memory issues
         <dependency>
-            <groupId>org.opendaylight.l2switch</groupId>
-            <artifactId>odl-l2switch-switch</artifactId>
+            <groupId>org.opendaylight.groupbasedpolicy</groupId>
+            <artifactId>odl-groupbasedpolicy-base</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.groupbasedpolicy</groupId>
+            <artifactId>odl-groupbasedpolicy-iovisor</artifactId>
+            <type>xml</type>
             <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.groupbasedpolicy</groupId>
+            <artifactId>odl-groupbasedpolicy-neutronmapper</artifactId>
             <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.l2switch</groupId>
-            <artifactId>odl-l2switch-switch-rest</artifactId>
+            <groupId>org.opendaylight.groupbasedpolicy</groupId>
+            <artifactId>odl-groupbasedpolicy-neutron-and-ofoverlay</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.groupbasedpolicy</groupId>
+            <artifactId>odl-groupbasedpolicy-ofoverlay</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.groupbasedpolicy</groupId>
+            <artifactId>odl-groupbasedpolicy-vpp</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.groupbasedpolicy</groupId>
+            <artifactId>odl-groupbasedpolicy-neutron-vpp-mapper</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.groupbasedpolicy</groupId>
+            <artifactId>odl-groupbasedpolicy-ui</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.groupbasedpolicy</groupId>
+            <artifactId>odl-groupbasedpolicy-ip-sgt-distribution-service</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.groupbasedpolicy</groupId>
+            <artifactId>odl-groupbasedpolicy-ne-location-provider</artifactId>
+            <type>xml</type>
             <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.groupbasedpolicy</groupId>
+            <artifactId>odl-groupbasedpolicy-ios-xe</artifactId>
             <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.groupbasedpolicy</groupId>
+            <artifactId>odl-groupbasedpolicy-sxp-ep-provider</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.groupbasedpolicy</groupId>
+            <artifactId>odl-groupbasedpolicy-sxp-ise-adapter</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        -->
+
+        <!-- Honeycomb/VBD -->
+        <!-- netconf connector is broken after last bump migration
+        <dependency>
+            <groupId>org.opendaylight.honeycomb.vbd</groupId>
+            <artifactId>odl-vbd</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.honeycomb.vbd</groupId>
+            <artifactId>odl-vbd-rest</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.honeycomb.vbd</groupId>
+            <artifactId>odl-vbd-ui</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        -->
+
+        <!-- L2switch -->
         <dependency>
             <groupId>org.opendaylight.l2switch</groupId>
-            <artifactId>odl-l2switch-switch-ui</artifactId>
+            <artifactId>odl-l2switch-switch-rest</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
 
-            <!-- NEMO -->
+        <!-- NEMO -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.nemo</groupId>
             <artifactId>odl-nemo-engine</artifactId>
@@ -161,8 +240,28 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- Netconf -->
+        <!-- netconf connector is broken after last bump migration
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-callhome-ssh</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-console</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+       <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-mdsal</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-topology</artifactId>
@@ -175,6 +274,7 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
 
         <!-- Netvirt -->
         <dependency>
@@ -185,20 +285,39 @@
         </dependency>
 
         <!-- OF-CONFIG -->
+        <!--
         <dependency>
             <groupId>org.opendaylight.of-config</groupId>
             <artifactId>odl-of-config-all</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
+
+        <!-- P4 Plugin -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
+        <dependency>
+            <groupId>org.opendaylight.p4plugin</groupId>
+            <artifactId>odl-p4plugin-all</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        -->
 
         <!-- SFC -->
+        <!-- netconf connector is broken after last bump migration
         <dependency>
             <groupId>org.opendaylight.sfc</groupId>
             <artifactId>odl-sfc-ios-xe-renderer</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.sfc</groupId>
+            <artifactId>odl-sfc-netconf</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.sfc</groupId>
             <artifactId>odl-sfc-openflow-renderer</artifactId>
@@ -211,16 +330,40 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
+
+        <!-- TSDR -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
+        <dependency>
+            <groupId>org.opendaylight.tsdr</groupId>
+            <artifactId>odl-tsdr-hsqldb-all</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        -->
+
+        <!-- Unimgr -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
+        <dependency>
+            <groupId>org.opendaylight.unimgr</groupId>
+            <artifactId>odl-unimgr</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        -->
 
         <!-- USC -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.usc</groupId>
             <artifactId>odl-usc-channel-ui</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
 
         <!-- VTN -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.vtn</groupId>
             <artifactId>odl-vtn-manager-rest</artifactId>
@@ -233,6 +376,7 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
 
     </dependencies>
 </project>
Integration distribution