Remove most projects temporarily.

Distribution-check jobs are taking too long, I blame Bug 7900.
The fix [0] currently fails [1] on
  org.opendaylight.infrautils.jobcoordinator-impl
but there may be more.

Also, the fixed code tests single features outside repos,
thus it is more strict and it can fail.
So it is better to remove everybody (except restconf)
and add them back with the new stricter SFT in place.

[0] https://git.opendaylight.org/gerrit/55963
[1] https://jenkins.opendaylight.org/releng/job/odlparent-distribution-check-carbon/621

Change-Id: Id2a9bd749aa1b216908766a5a09c053a96f204a8
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index bdbc6accf8546cd391c6f834ab7063211d8f511c..3985913bdd4ee725371dc72386ca08d3fbb301ca 100644 (file)
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -48,13 +48,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.lispflowmapping</groupId>
-                <artifactId>lispflowmapping-artifacts</artifactId>
-                <version>${lispflowmapping.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index ed184169fd8a7f359442192dd37c3e7028e18326..f2d10f2d99fad8be74049119734a4ac4e02c075f 100644 (file)
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -41,55 +41,6 @@
     <dependencyManagement>
         <!-- User facing feature repositories. -->
         <dependencies>
-
-            <!-- AAA -->
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>features4-aaa</artifactId>
-                <version>${aaa.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>features4-aaa-shiro</artifactId>
-                <version>${aaa.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- Controller -->
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>features4-extras</artifactId>
-                <version>${controller.extras.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>features4-mdsal</artifactId>
-                <version>${mdsal.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>features4-mdsal-benchmark</artifactId>
-                <version>${benchmark.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- InfraUtils -->
-            <dependency>
-                <groupId>org.opendaylight.infrautils</groupId>
-                <artifactId>infrautils-features4</artifactId>
-                <version>${infrautils.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
             <!-- Netconf -->
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
@@ -112,23 +63,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-
-            <!-- ODL Parent -->
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>features4-akka</artifactId>
-                <version>${odlparent.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>features4-odlparent</artifactId>
-                <version>${odlparent.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
         </dependencies>
     </dependencyManagement>
 </project>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index c7c3e933c2b3e117ff9002e499ba8b1d1d520f59..238baef70ab8401c89e48bf605d27ee863d2e395 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -58,48 +58,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features4-aaa</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features4-aaa-shiro</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features4-extras</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features4-mdsal</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features4-mdsal-benchmark</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.infrautils</groupId>
-            <artifactId>infrautils-features4</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.lispflowmapping</groupId>
-            <artifactId>features4-lispflowmapping</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=7891
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
@@ -120,17 +78,5 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features4-akka</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features4-odlparent</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
     </dependencies>
 </project>

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 204bf2e7c5110d2663aa9da88975d9d191b8f681..434beb6df6fe5bc1b45357de68f234f1dab13086 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -58,13 +58,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <!-- Lispflowmapping -->
-        <dependency>
-            <groupId>org.opendaylight.lispflowmapping</groupId>
-            <artifactId>odl-lispflowmapping-msmr</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=7891
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>