X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=artifacts%2Fupstream%2Ffeature-repos%2Fpom.xml;h=d292ea365ec8fc3b3f85d32a74e84d5bb51c48e3;hb=123d08efedbef2048a297797ce780e8b6f489bac;hp=bfef93dfe2636101fa94724b663234a048e7dc89;hpb=ecb1d8a5e8387afb502ee61846bfcfca6a242214;p=integration%2Fdistribution.git

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index bfef93df..d292ea36 100644
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.integration</groupId>
         <artifactId>properties</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
+        <version>0.10.0-SNAPSHOT</version>
         <relativePath>../properties</relativePath>
     </parent>
     <artifactId>feature-repo-artifacts</artifactId>
@@ -58,44 +58,6 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
-        <!-- ALTO -->
-        <profile>
-            <id>alto</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.alto</groupId>
-                        <artifactId>features4-alto</artifactId>
-                        <version>${alto.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- BIER -->
-        <profile>
-            <id>bier</id>
-            <activation>
-                <!-- Disabled due to failed merge job -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.bier</groupId>
-                        <artifactId>features-bier</artifactId>
-                        <version>${bier.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
         <!-- Controller -->
         <profile>
             <id>controller</id>
@@ -114,7 +76,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>features-mdsal</artifactId>
-                        <version>${mdsal.version}</version>
+                        <version>${controller.version}</version>
                         <classifier>features</classifier>
                         <type>xml</type>
                     </dependency>
@@ -128,81 +90,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>features-mdsal-trace</artifactId>
-                        <version>${mdsal.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- Dlux -->
-        <profile>
-            <id>dlux</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.dlux</groupId>
-                        <artifactId>features-dlux</artifactId>
-                        <version>${dlux.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- DluxApps -->
-        <profile>
-            <id>dluxapps</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.dluxapps</groupId>
-                        <artifactId>features-dluxapps</artifactId>
-                        <version>${dluxapps.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- Eman -->
-        <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-        <profile>
-            <id>eman</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.eman</groupId>
-                        <artifactId>features-eman</artifactId>
-                        <version>${eman.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- FaaS -->
-        <profile>
-            <id>faas</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.faas</groupId>
-                        <artifactId>features4-faas</artifactId>
-                        <version>${faas.version}</version>
+                        <version>${controller.version}</version>
                         <classifier>features</classifier>
                         <type>xml</type>
                     </dependency>
@@ -227,81 +115,6 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
-        <!-- L2switch -->
-        <profile>
-            <id>l2switch</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.l2switch</groupId>
-                        <artifactId>features-l2switch</artifactId>
-                        <version>${l2switch.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- NEMO -->
-        <profile>
-            <id>nemo</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.nemo</groupId>
-                        <artifactId>nemo-features</artifactId>
-                        <version>${nemo.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- NIC -->
-        <profile>
-            <id>nic</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.nic</groupId>
-                        <artifactId>features-nic</artifactId>
-                        <version>${nic.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- OCP Plugin -->
-        <profile>
-            <id>ocpplugin</id>
-            <activation>
-                <!-- Inactive -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.ocpplugin</groupId>
-                        <artifactId>features-ocpplugin</artifactId>
-                        <version>${ocpplugin.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
         <!-- ODL Parent -->
         <profile>
             <id>odlparent</id>
@@ -327,63 +140,6 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
-        <!-- OF-CONFIG -->
-        <profile>
-            <id>ofconfig</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.of-config</groupId>
-                        <artifactId>features-of-config</artifactId>
-                        <version>${ofconfig.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- P4 Plugin -->
-        <profile>
-            <id>p4plugin</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.p4plugin</groupId>
-                        <artifactId>features-p4plugin</artifactId>
-                        <version>${p4plugin.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- Packetcable -->
-        <profile>
-            <id>packetcable</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.packetcable</groupId>
-                        <artifactId>features4-packetcable-policy</artifactId>
-                        <version>${packetcable.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
         <!-- SFC -->
         <profile>
             <id>sfc</id>
@@ -402,98 +158,5 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
-        <!-- SNMP -->
-        <profile>
-            <id>snmp</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.snmp</groupId>
-                        <artifactId>features-snmp</artifactId>
-                        <version>${snmp.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- SNMP4SDN -->
-        <profile>
-            <id>snmp4sdn</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.snmp4sdn</groupId>
-                        <artifactId>features-snmp4sdn</artifactId>
-                        <version>${snmp4sdn.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- SXP -->
-        <profile>
-            <id>sxp</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.sxp</groupId>
-                        <artifactId>features-sxp</artifactId>
-                        <version>${sxp.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- USC -->
-        <profile>
-            <id>usc</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.usc</groupId>
-                        <artifactId>usc-features</artifactId>
-                        <version>${usc.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- VTN -->
-        <profile>
-            <id>vtn</id>
-            <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.vtn</groupId>
-                        <artifactId>features-vtn-manager</artifactId>
-                        <version>${vtn-manager.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
     </profiles>
 </project>