From ea00a52ebe23876a638426379a9ef5753dc5752b Mon Sep 17 00:00:00 2001
From: Roger Ferrel <Roger.L.Ferrel@raytheon.com>
Date: Tue, 2 Jul 2013 11:13:23 -0500
Subject: [PATCH] Issue #1964 clean up of features and manifest.

Change-Id: Ie2fc8ce45853499d80863ab83ba6a60b76444548

Former-commit-id: 41c46e14c05f25181d0d59240445a0e068b31453 [formerly 41c46e14c05f25181d0d59240445a0e068b31453 [formerly 2590369cb4aa0c3d9c3885acb0ef27de36744e6d]]
Former-commit-id: 7d3362d2b5c8b299ee1a00999d022cb4afdb4b94
Former-commit-id: 201e62a4addc498f66329830f88b00511335ea49
---
 .../feature.xml                               | 29 ++++++++++---------
 .../META-INF/MANIFEST.MF                      | 10 +++----
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.archive.feature/feature.xml b/cave/com.raytheon.uf.viz.archive.feature/feature.xml
index c091f835df..17e8e6923a 100644
--- a/cave/com.raytheon.uf.viz.archive.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.archive.feature/feature.xml
@@ -18,19 +18,8 @@
    </license>
 
    <requires>
-      <import plugin="org.eclipse.ui" version="3.8.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="com.raytheon.viz.ui" version="1.12.1174" match="greaterOrEqual"/>
-      <import plugin="com.raytheon.uf.common.serialization" version="1.12.1174" match="greaterOrEqual"/>
-      <import plugin="com.raytheon.uf.common.localization" version="1.12.1174" match="greaterOrEqual"/>
-      <import plugin="com.raytheon.uf.common.archive" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="com.raytheon.uf.common.time" version="1.12.1174" match="greaterOrEqual"/>
-      <import plugin="com.raytheon.uf.common.util" version="1.12.1174" match="greaterOrEqual"/>
-      <import plugin="org.apache.commons.lang" version="2.3.0" match="greaterOrEqual"/>
-      <import plugin="com.raytheon.uf.viz.core" version="1.12.1174" match="greaterOrEqual"/>
-      <import plugin="com.raytheon.uf.common.units" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="com.raytheon.uf.common.status" version="1.12.1174" match="greaterOrEqual"/>
-      <import plugin="org.apache.commons.io" version="2.4.0" match="greaterOrEqual"/>
+      <import feature="com.raytheon.uf.common.base.feature" version="1.0.0.qualifier"/>
+      <import feature="com.raytheon.uf.viz.base.feature" version="1.0.0.qualifier"/>
    </requires>
 
    <plugin
@@ -53,4 +42,18 @@
          install-size="0"
          version="0.0.0"/>
 
+   <plugin
+         id="org.eclipse.core.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/edexOsgi/com.raytheon.uf.common.archive/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.archive/META-INF/MANIFEST.MF
index c3617550f9..7fa1445e69 100644
--- a/edexOsgi/com.raytheon.uf.common.archive/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.archive/META-INF/MANIFEST.MF
@@ -7,8 +7,8 @@ Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: com.raytheon.uf.common.archive.config,
  com.raytheon.uf.common.archive.exception
-Require-Bundle: com.raytheon.uf.common.util;bundle-version="1.12.1174",
- com.raytheon.uf.common.localization;bundle-version="1.12.1174",
- com.raytheon.uf.common.status;bundle-version="1.12.1174",
- org.apache.commons.io;bundle-version="2.4.0",
- com.raytheon.uf.common.time;bundle-version="1.12.1174"
+Require-Bundle: com.raytheon.uf.common.util,
+ com.raytheon.uf.common.localization,
+ com.raytheon.uf.common.status,
+ org.apache.commons.io,
+ com.raytheon.uf.common.time