From d66d7b596839d9c525625ae6367a37091bea2263 Mon Sep 17 00:00:00 2001
From: Bryan Kowal <Bryan.Kowal@raytheon.com>
Date: Mon, 6 May 2013 23:00:18 -0500
Subject: [PATCH] Issue #1927 - fix CAVE dependency tree

Change-Id: Ic9a8a58ec8992cb91980d14f3c1a92573170f6f1

Former-commit-id: 0567e633bc2e41d2052ea13401ba7f6baa8900aa
---
 cave/com.raytheon.uf.viz.common.core.feature/feature.xml      | 1 +
 cave/com.raytheon.uf.viz.core.feature/feature.xml             | 1 +
 .../feature.xml                                               | 1 -
 cave/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml | 3 ++-
 cave/com.raytheon.viz.dataaccess.feature/feature.xml          | 4 ++++
 ncep/com.raytheon.uf.viz.ncep.nsharp.feature/feature.xml      | 1 +
 6 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.common.core.feature/feature.xml b/cave/com.raytheon.uf.viz.common.core.feature/feature.xml
index 53313fd60a..58b1e636a7 100644
--- a/cave/com.raytheon.uf.viz.common.core.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.common.core.feature/feature.xml
@@ -18,6 +18,7 @@
    </license>
 
    <requires>
+      <import feature="com.raytheon.uf.viz.base.feature" version="1.0.0.qualifier"/>
       <import feature="com.raytheon.uf.viz.cots.feature" version="1.0.0.qualifier"/>
    </requires>
 
diff --git a/cave/com.raytheon.uf.viz.core.feature/feature.xml b/cave/com.raytheon.uf.viz.core.feature/feature.xml
index d6be8c7440..4a197287e5 100644
--- a/cave/com.raytheon.uf.viz.core.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.core.feature/feature.xml
@@ -20,6 +20,7 @@
    <requires>
       <import feature="com.raytheon.uf.viz.cots.feature" version="1.0.0.qualifier"/>
       <import feature="com.raytheon.uf.viz.common.core.feature" version="1.0.0.qualifier"/>
+      <import feature="com.raytheon.uf.viz.localization.perspective.feature" version="1.0.0.qualifier"/>
    </requires>
 
    <plugin
diff --git a/cave/com.raytheon.uf.viz.localization.perspective.feature/feature.xml b/cave/com.raytheon.uf.viz.localization.perspective.feature/feature.xml
index b59da369c9..5012aca769 100644
--- a/cave/com.raytheon.uf.viz.localization.perspective.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.localization.perspective.feature/feature.xml
@@ -20,7 +20,6 @@
    <requires>
       <import feature="com.raytheon.uf.viz.cots.feature" version="1.0.0.qualifier"/>
       <import feature="com.raytheon.uf.viz.common.core.feature" version="1.0.0.qualifier"/>
-      <import feature="com.raytheon.uf.viz.core.feature" version="1.0.0.qualifier"/>
    </requires>
 
    <plugin
diff --git a/cave/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml b/cave/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml
index f39c272482..2ff062d6b6 100644
--- a/cave/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml
@@ -19,7 +19,8 @@
 
    <requires>
       <import feature="com.raytheon.uf.viz.cots.feature" version="1.0.0.qualifier"/>
-      <import feature="com.raytheon.uf.viz.common.core.feature" version="1.0.0.qualifier"/>
+      <import feature="com.raytheon.uf.viz.core.feature" version="1.0.0.qualifier"/>
+      <import feature="com.raytheon.uf.viz.ncep.core.feature" version="1.0.0.qualifier"/>
    </requires>
 
    <plugin
diff --git a/cave/com.raytheon.viz.dataaccess.feature/feature.xml b/cave/com.raytheon.viz.dataaccess.feature/feature.xml
index bcc39ab4b1..186eec34c5 100644
--- a/cave/com.raytheon.viz.dataaccess.feature/feature.xml
+++ b/cave/com.raytheon.viz.dataaccess.feature/feature.xml
@@ -17,6 +17,10 @@
       [Enter License Description here.]
    </license>
 
+   <requires>
+      <import feature="com.raytheon.uf.viz.core.feature" version="1.0.0.qualifier"/>
+   </requires>
+
    <plugin
          id="com.raytheon.viz.dataaccess"
          download-size="0"
diff --git a/ncep/com.raytheon.uf.viz.ncep.nsharp.feature/feature.xml b/ncep/com.raytheon.uf.viz.ncep.nsharp.feature/feature.xml
index 64254aa144..9cad0f574b 100644
--- a/ncep/com.raytheon.uf.viz.ncep.nsharp.feature/feature.xml
+++ b/ncep/com.raytheon.uf.viz.ncep.nsharp.feature/feature.xml
@@ -25,6 +25,7 @@
       <import feature="com.raytheon.uf.viz.sounding.feature" version="1.0.0.qualifier"/>
       <import feature="com.raytheon.uf.viz.displays.feature" version="1.0.0.qualifier"/>
       <import feature="com.raytheon.uf.viz.ncep.displays.feature" version="1.0.0.qualifier"/>
+      <import feature="com.raytheon.uf.viz.d2d.skewt.feature" version="1.0.0.qualifier"/>
    </requires>
 
    <plugin