X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=artifacts%2Fupstream%2Fsingle-features%2Fpom.xml;h=743ced5085ff4757ac1a361cd8d1e56000aba730;hb=00820de570406de89a43d0d9e74e1ebb49bf7847;hp=a13cc783d6e1b3199e25347676dfc3404c26722d;hpb=7319feb571848540a5672ed5d7e273039fb7eebb;p=integration%2Fdistribution.git

diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index a13cc783..743ced50 100644
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.integration</groupId>
         <artifactId>properties</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
+        <version>0.12.1-SNAPSHOT</version>
         <relativePath>../properties</relativePath>
     </parent>
     <artifactId>single-feature-artifacts</artifactId>
@@ -37,472 +37,51 @@
         <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=artifacts/upstream/single-features;hb=HEAD</url>
         <tag>HEAD</tag>
     </scm>
-    <dependencyManagement>
-        <dependencies>
-            <!-- User facing single features. -->
-            <!-- TODO: Open Bugs against projects to export user-facing single feature versions in artifact pom. -->
-
-            <!-- AAA -->
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>odl-aaa-cert</artifactId>
-                <version>${aaa.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>odl-aaa-shiro</artifactId>
-                <version>${aaa.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- ALTO -->
-            <!-- Removed for the odlparent 3 / yangtools 2 migration
-            <dependency>
-                <groupId>org.opendaylight.alto</groupId>
-                <artifactId>odl-alto-simpleird</artifactId>
-                <version>${alto.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.alto</groupId>
-                <artifactId>odl-alto-manual-maps</artifactId>
-                <version>${alto.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.alto</groupId>
-                <artifactId>odl-alto-simpleecs</artifactId>
-                <version>${alto.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.alto</groupId>
-                <artifactId>odl-alto-auto-maps</artifactId>
-                <version>${alto.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.alto</groupId>
-                <artifactId>odl-alto-spce</artifactId>
-                <version>${alto.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
-
-            <!-- BIER -->
-            <!-- Comment due to fail merge job
-            <dependency>
-                <groupId>org.opendaylight.bier</groupId>
-                <artifactId>odl-bier-all</artifactId>
-                <version>${bier.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
-
-            <!-- CONTROLLER -->
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>odl-mdsal-broker</artifactId>
-                <version>${mdsal.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- Dlux Apps -->
-            <dependency>
-                <groupId>org.opendaylight.dluxapps</groupId>
-                <artifactId>odl-dluxapps-nodes</artifactId>
-                <version>${dluxapps.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.dluxapps</groupId>
-                <artifactId>odl-dluxapps-topology</artifactId>
-                <version>${dluxapps.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.dluxapps</groupId>
-                <artifactId>odl-dluxapps-yangman</artifactId>
-                <version>${dluxapps.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.dluxapps</groupId>
-                <artifactId>odl-dluxapps-yangvisualizer</artifactId>
-                <version>${dluxapps.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-
-            <!-- Eman -->
-            <!-- Removed for the odlparent 3 / yangtools 2 migration
-            <dependency>
-                <groupId>org.opendaylight.eman</groupId>
-                <artifactId>odl-eman-ui</artifactId>
-                <version>${eman.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.eman</groupId>
-                <artifactId>odl-eman-api</artifactId>
-                <version>${eman.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.eman</groupId>
-                <artifactId>odl-eman</artifactId>
-                <version>${eman.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            -->
-
-            <!-- FAAS -->
-            <!-- Removed for the odlparent 3 / yangtools 2 migration
-            <dependency>
-                <groupId>org.opendaylight.faas</groupId>
-                <artifactId>odl-faas-base</artifactId>
-                <version>${faas.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.faas</groupId>
-                <artifactId>odl-faas-vxlan-ovs-adapter</artifactId>
-                <version>${faas.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.faas</groupId>
-                <artifactId>odl-faas-vxlan-fabric</artifactId>
-                <version>${faas.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.faas</groupId>
-                <artifactId>odl-faas-vlan-fabric</artifactId>
-                <version>${faas.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.faas</groupId>
-                <artifactId>odl-faas-fabric</artifactId>
-                <version>${faas.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.faas</groupId>
-                <artifactId>odl-faas-fabricmgr</artifactId>
-                <version>${faas.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.faas</groupId>
-                <artifactId>odl-faas-uln-mapper</artifactId>
-                <version>${faas.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.faas</groupId>
-                <artifactId>odl-faas-all</artifactId>
-                <version>${faas.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            -->
-
-            <!-- L2switch -->
-            <dependency>
-                <groupId>org.opendaylight.l2switch</groupId>
-                <artifactId>odl-l2switch-switch</artifactId>
-                <version>${l2switch.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.l2switch</groupId>
-                <artifactId>odl-l2switch-switch-rest</artifactId>
-                <version>${l2switch.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.l2switch</groupId>
-                <artifactId>odl-l2switch-switch-ui</artifactId>
-                <version>${l2switch.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- NEMO -->
-            <!-- Removed for the odlparent 3 / yangtools 2 migration
-            <dependency>
-                <groupId>org.opendaylight.nemo</groupId>
-                <artifactId>odl-nemo-engine</artifactId>
-                <version>${nemo.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.nemo</groupId>
-                <artifactId>odl-nemo-engine-rest</artifactId>
-                <version>${nemo.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.nemo</groupId>
-                <artifactId>odl-nemo-engine-ui</artifactId>
-                <version>${nemo.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.nemo</groupId>
-                <artifactId>odl-nemo-openflow-renderer</artifactId>
-                <version>${nemo.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.nemo</groupId>
-                <artifactId>odl-nemo-cli-renderer</artifactId>
-                <version>${nemo.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
-
-            <!-- NIC -->
-            <!-- Removed for the odlparent 3 / yangtools 2 migration
-            <dependency>
-                <groupId>org.opendaylight.nic</groupId>
-                <artifactId>odl-nic-intent-common</artifactId>
-                <version>${nic.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.nic</groupId>
-                <artifactId>odl-nic-core-mdsal</artifactId>
-                <version>${nic.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
-
-            <!-- OCP Plugin -->
-            <!-- Not active project
-            <dependency>
-                <groupId>org.opendaylight.ocpplugin</groupId>
-                <artifactId>odl-ocpplugin-all</artifactId>
-                <version>${ocpplugin.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
-
-            <!-- OF-CONFIG -->
-            <!-- Removed for the odlparent 3 / yangtools 2 migration
-            <dependency>
-                <groupId>org.opendaylight.of-config</groupId>
-                <artifactId>odl-of-config-all</artifactId>
-                <version>${ofconfig.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
-
-            <!-- P4 Plugin -->
-            <!-- Removed for the odlparent 3 / yangtools 2 migration
-            <dependency>
-                <groupId>org.opendaylight.p4plugin</groupId>
-                <artifactId>odl-p4plugin-all</artifactId>
-                <version>${p4plugin.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
-
-            <!-- Packetcable -->
-            <!-- Removed for the odlparent 3 / yangtools 2 migration
-            <dependency>
-                <groupId>org.opendaylight.packetcable</groupId>
-                <artifactId>odl-packetcable-policy-model</artifactId>
-                <version>${packetcable.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.packetcable</groupId>
-                <artifactId>odl-packetcable-policy-server</artifactId>
-                <version>${packetcable.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.packetcable</groupId>
-                <artifactId>odl-packetcable-policy-server-all</artifactId>
-                <version>${packetcable.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
-
-            <!-- SFC -->
-            <dependency>
-                <groupId>org.opendaylight.sfc</groupId>
-                <artifactId>odl-sfc-ios-xe-renderer</artifactId>
-                <version>${sfc.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.sfc</groupId>
-                <artifactId>odl-sfc-netconf</artifactId>
-                <version>${sfc.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.sfc</groupId>
-                <artifactId>odl-sfc-openflow-renderer</artifactId>
-                <version>${sfc.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.sfc</groupId>
-                <artifactId>odl-sfc-ovs</artifactId>
-                <version>${sfc.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.sfc</groupId>
-                <artifactId>odl-sfc-sb-rest</artifactId>
-                <version>${sfc.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.sfc</groupId>
-                <artifactId>odl-sfc-ui</artifactId>
-                <version>${sfc.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.sfc</groupId>
-                <artifactId>odl-sfc-vpp-renderer</artifactId>
-                <version>${sfc.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.sfc</groupId>
-                <artifactId>odl-sfclisp</artifactId>
-                <version>${sfc.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.sfc</groupId>
-                <artifactId>odl-sfc-shell</artifactId>
-                <version>${sfc.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-
-            <!-- SNMP -->
-            <dependency>
-                <groupId>org.opendaylight.snmp</groupId>
-                <artifactId>odl-snmp-plugin</artifactId>
-                <version>${snmp.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- SNMP4SDN -->
-            <!-- Removed for the odlparent 3 / yangtools 2 migration
-            <dependency>
-                <groupId>org.opendaylight.snmp4sdn</groupId>
-                <artifactId>odl-snmp4sdn-snmp4sdn</artifactId>
-                <version>${snmp4sdn.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
-
-            <!-- SXP -->
-            <dependency>
-                <groupId>org.opendaylight.sxp</groupId>
-                <artifactId>odl-sxp-controller</artifactId>
-                <version>${sxp.version}</version>
-                <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>
-                <version>${unimgr.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
-
-            <!-- USC -->
-            <!-- Removed for the odlparent 3 / yangtools 2 migration
-            <dependency>
-                <groupId>org.opendaylight.usc</groupId>
-                <artifactId>odl-usc-channel-ui</artifactId>
-                <version>${usc.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
-
-            <!-- VTN -->
-            <!-- Removed for the odlparent 3 / yangtools 2 migration
-            <dependency>
-                <groupId>org.opendaylight.vtn</groupId>
-                <artifactId>odl-vtn-manager-rest</artifactId>
-                <version>${vtn-manager.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.vtn</groupId>
-                <artifactId>odl-vtn-manager-neutron</artifactId>
-                <version>${vtn-manager.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
-        </dependencies>
-    </dependencyManagement>
+    <!-- User facing single features. -->
+    <!-- TODO: Open Bugs against projects to export user-facing single feature versions in artifact pom. -->
+    <profiles>
+        <!-- AAA -->
+        <profile>
+            <id>aaa</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.opendaylight.aaa</groupId>
+                        <artifactId>odl-aaa-cert</artifactId>
+                        <version>${aaa.version}</version>
+                        <classifier>features</classifier>
+                        <type>xml</type>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.opendaylight.aaa</groupId>
+                        <artifactId>odl-aaa-shiro</artifactId>
+                        <version>${aaa.version}</version>
+                        <classifier>features</classifier>
+                        <type>xml</type>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
+        <!-- CONTROLLER -->
+        <profile>
+            <id>controller</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.opendaylight.controller</groupId>
+                        <artifactId>odl-mdsal-broker</artifactId>
+                        <version>${controller.version}</version>
+                        <classifier>features</classifier>
+                        <type>xml</type>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
+    </profiles>
 </project>