From 16046a4ddebed8da7805da7b474e739e608a4eb0 Mon Sep 17 00:00:00 2001
From: Max Schenkelberg <max.schenkelberg@raytheon.com>
Date: Mon, 6 Jan 2014 14:32:47 -0600
Subject: [PATCH] Issue #2620 Made plugins include utility/resources folders in
 build.properties for deployment of precompiled jars.  Cleaned up manifest
 versioning in base cots plugins to avoid possible ambiguity between eclipse
 plugins and repo plugins.

Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index

Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5

Former-commit-id: b65366dcdfa48e431b5c8bf10a72879b111cfd8d
---
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../feature.xml                               | 12 ++--
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../META-INF/MANIFEST.MF                      |  1 -
 .../META-INF/MANIFEST.MF                      |  1 -
 cots/com.google.guava/META-INF/MANIFEST.MF    |  2 +-
 cots/com.mchange/META-INF/MANIFEST.MF         |  2 +-
 cots/javax.jms/META-INF/MANIFEST.MF           |  2 +-
 cots/javax.measure/META-INF/MANIFEST.MF       |  2 +-
 .../META-INF/MANIFEST.MF                      |  4 +-
 .../META-INF/MANIFEST.MF                      |  4 +-
 .../META-INF/MANIFEST.MF                      |  4 +-
 cots/javax.media.opengl/META-INF/MANIFEST.MF  |  2 +-
 cots/javax.persistence/META-INF/MANIFEST.MF   |  2 +-
 cots/net.sf.ehcache/META-INF/MANIFEST.MF      |  2 +-
 cots/net.sf.swtaddons/META-INF/MANIFEST.MF    |  2 +-
 cots/org.apache.activemq/META-INF/MANIFEST.MF |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 cots/org.apache.mina/META-INF/MANIFEST.MF     |  2 +-
 cots/org.apache.qpid/META-INF/MANIFEST.MF     |  2 +-
 cots/org.dom4j/META-INF/MANIFEST.MF           |  2 +-
 cots/org.eclipse.jetty/META-INF/MANIFEST.MF   |  2 +-
 cots/org.hibernate/META-INF/MANIFEST.MF       |  2 +-
 cots/org.jep.linux32/META-INF/MANIFEST.MF     |  3 +-
 cots/org.jep.linux64/META-INF/MANIFEST.MF     |  3 +-
 cots/org.jep.win32/META-INF/MANIFEST.MF       |  3 +-
 cots/org.jep/META-INF/MANIFEST.MF             |  2 +-
 cots/org.postgres/META-INF/MANIFEST.MF        |  2 +-
 .../build.properties                          |  4 +-
 .../build.properties                          |  3 +-
 .../feature.xml                               | 62 +++++++++----------
 .../META-INF/MANIFEST.MF                      |  1 -
 .../build.properties                          |  3 +-
 .../build.properties                          |  3 +-
 .../build.properties                          |  3 +-
 .../build.properties                          |  3 +-
 .../build.properties                          |  3 +-
 .../build.properties                          |  3 +-
 .../build.properties                          |  4 +-
 .../feature.xml                               | 14 ++---
 .../build.properties                          |  3 +-
 .../build.properties                          |  3 +-
 .../build.properties                          |  4 +-
 .../build.properties                          |  4 +-
 .../build.properties                          |  4 +-
 .../build.properties                          |  3 +-
 .../com.raytheon.uf.edex.ohd/build.properties |  4 +-
 .../build.properties                          |  3 +-
 .../build.properties                          |  4 +-
 .../build.properties                          |  4 +-
 .../META-INF/MANIFEST.MF                      |  1 -
 .../META-INF/MANIFEST.MF                      |  2 -
 .../META-INF/MANIFEST.MF                      |  1 -
 .../META-INF/MANIFEST.MF                      |  1 -
 58 files changed, 125 insertions(+), 103 deletions(-)

diff --git a/RadarServer/com.raytheon.rcm.server.mq/META-INF/MANIFEST.MF b/RadarServer/com.raytheon.rcm.server.mq/META-INF/MANIFEST.MF
index 479139deaf..09fde52f8d 100644
--- a/RadarServer/com.raytheon.rcm.server.mq/META-INF/MANIFEST.MF
+++ b/RadarServer/com.raytheon.rcm.server.mq/META-INF/MANIFEST.MF
@@ -8,5 +8,5 @@ Require-Bundle: com.raytheon.rcm.server;bundle-version="1.0.0",
  org.apache.activemq;bundle-version="5.2.0",
  com.raytheon.rcm.lib;bundle-version="1.0.0",
  javax.jms;bundle-version="1.0.0",
- org.apache.qpid;bundle-version="1.0.0",
+ org.apache.qpid;bundle-version="0.0.0",
  org.itadaki.bzip2;bundle-version="0.9.1"
diff --git a/cave/com.raytheon.uf.viz.base.feature/feature.xml b/cave/com.raytheon.uf.viz.base.feature/feature.xml
index 2c9e22de0f..dd5377eb28 100644
--- a/cave/com.raytheon.uf.viz.base.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.base.feature/feature.xml
@@ -38,7 +38,7 @@
          id="org.apache.activemq"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="5.3.0"/>
 
    <plugin
          id="com.raytheon.uf.viz.localization"
@@ -146,7 +146,7 @@
          id="net.sf.swtaddons"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="0.1.1"/>
 
    <plugin
          id="org.eclipse.draw2d"
@@ -172,7 +172,7 @@
          id="javax.media.opengl"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="1.1.1"/>
 
    <plugin
          id="javax.media.opengl.linux32"
@@ -180,7 +180,7 @@
          arch="x86"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.1.1"
          fragment="true"/>
 
    <plugin
@@ -189,7 +189,7 @@
          arch="x86_64"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.1.1"
          fragment="true"/>
 
    <plugin
@@ -198,7 +198,7 @@
          arch="x86"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.1.1"
          fragment="true"/>
 
    <plugin
diff --git a/cave/com.raytheon.uf.viz.core/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.core/META-INF/MANIFEST.MF
index 421b164ed5..350d78994f 100644
--- a/cave/com.raytheon.uf.viz.core/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.core/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.ui,
  org.jep;bundle-version="1.0.0",
  com.raytheon.uf.common.datastorage;bundle-version="1.11.11",
  org.apache.velocity;bundle-version="1.5.0",
- org.apache.qpid;bundle-version="1.0.0",
+ org.apache.qpid;bundle-version="0.18.0",
  javax.jms;bundle-version="1.0.0",
  org.apache.activemq,
  com.raytheon.uf.common.util;bundle-version="1.0.0",
diff --git a/cave/com.raytheon.uf.viz.productbrowser/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.productbrowser/META-INF/MANIFEST.MF
index 3778a53e41..dd2771cd41 100644
--- a/cave/com.raytheon.uf.viz.productbrowser/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.productbrowser/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.4.1",
  com.raytheon.uf.viz.core,
  javax.persistence;bundle-version="1.0.0",
  org.hibernate;bundle-version="1.0.0",
- net.sf.swtaddons;bundle-version="1.0.0"
+ net.sf.swtaddons;bundle-version="0.0.0"
 Export-Package: com.raytheon.uf.viz.productbrowser;
   uses:="org.eclipse.jface.action,
    com.raytheon.uf.viz.core.rsc,
diff --git a/cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF
index 0cf745162c..e7f413f538 100644
--- a/cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF
@@ -24,7 +24,6 @@ Require-Bundle: org.eclipse.ui,
  com.raytheon.uf.viz.personalities.cave;bundle-version="1.0.0";visibility:=reexport,
  com.raytheon.uf.viz.spring.dm
 Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: com.raytheon.viz.ui.personalities.awips
 Import-Package: com.raytheon.uf.common.pypies,
diff --git a/cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
index 905c924a38..91a8ad459f 100644
--- a/cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
@@ -35,7 +35,6 @@ Export-Package: com.raytheon.viz.warngen,
  com.raytheon.viz.warngen.gis,
  com.raytheon.viz.warngen.gui,
  com.raytheon.viz.warngen.util
-Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.raytheon.uf.common.activetable,
  com.raytheon.uf.common.dataplugin.text.request,
diff --git a/cots/com.google.guava/META-INF/MANIFEST.MF b/cots/com.google.guava/META-INF/MANIFEST.MF
index 4b29aab88e..6141576c17 100644
--- a/cots/com.google.guava/META-INF/MANIFEST.MF
+++ b/cots/com.google.guava/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Google Common (Guava)
 Bundle-SymbolicName: com.google.guava
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 11.0.2
 Bundle-Vendor: GOOGLE
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: guava-11.0.2.jar 
diff --git a/cots/com.mchange/META-INF/MANIFEST.MF b/cots/com.mchange/META-INF/MANIFEST.MF
index 9403868689..8869f3fb1b 100644
--- a/cots/com.mchange/META-INF/MANIFEST.MF
+++ b/cots/com.mchange/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mchange Plug-in
 Bundle-SymbolicName: com.mchange
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.9.1
 Bundle-ClassPath: c3p0-0.9.1.jar,
  .
 Export-Package: com.mchange,
diff --git a/cots/javax.jms/META-INF/MANIFEST.MF b/cots/javax.jms/META-INF/MANIFEST.MF
index 2798453b71..83cf018d7b 100644
--- a/cots/javax.jms/META-INF/MANIFEST.MF
+++ b/cots/javax.jms/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Jms
 Bundle-SymbolicName: javax.jms
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.1
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: geronimo-jms_1.1_spec-1.1.1.jar,
  .
diff --git a/cots/javax.measure/META-INF/MANIFEST.MF b/cots/javax.measure/META-INF/MANIFEST.MF
index d8984552c5..e1199bba53 100644
--- a/cots/javax.measure/META-INF/MANIFEST.MF
+++ b/cots/javax.measure/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Measure Plug-in
 Bundle-SymbolicName: javax.measure
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.0
 Bundle-ClassPath: jsr-275-1.0-beta-2.jar
 Export-Package: javax.measure,
  javax.measure.converter,
diff --git a/cots/javax.media.opengl.linux32/META-INF/MANIFEST.MF b/cots/javax.media.opengl.linux32/META-INF/MANIFEST.MF
index f28f47b3a7..6c5f41a53d 100644
--- a/cots/javax.media.opengl.linux32/META-INF/MANIFEST.MF
+++ b/cots/javax.media.opengl.linux32/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JOGL Linux Specific Fragment 32-bit
 Bundle-SymbolicName: javax.media.opengl.linux32
-Bundle-Version: 1.1.0
+Bundle-Version: 1.1.1
 Bundle-Vendor: Raytheon-bundled OSS
-Fragment-Host: javax.media.opengl;bundle-version="1.1.0"
+Fragment-Host: javax.media.opengl;bundle-version="1.1.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86))
diff --git a/cots/javax.media.opengl.linux64/META-INF/MANIFEST.MF b/cots/javax.media.opengl.linux64/META-INF/MANIFEST.MF
index 28ead1a1e8..148edfb6eb 100644
--- a/cots/javax.media.opengl.linux64/META-INF/MANIFEST.MF
+++ b/cots/javax.media.opengl.linux64/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JOGL Linux Specific Fragment 64-bit
 Bundle-SymbolicName: javax.media.opengl.linux64
-Bundle-Version: 1.1.0
+Bundle-Version: 1.1.1
 Bundle-Vendor: Raytheon-bundled OSS
-Fragment-Host: javax.media.opengl;bundle-version="1.1.0"
+Fragment-Host: javax.media.opengl;bundle-version="1.1.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
diff --git a/cots/javax.media.opengl.win32/META-INF/MANIFEST.MF b/cots/javax.media.opengl.win32/META-INF/MANIFEST.MF
index 861756dc37..3c67915828 100644
--- a/cots/javax.media.opengl.win32/META-INF/MANIFEST.MF
+++ b/cots/javax.media.opengl.win32/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JOGL Win32 Specific Fragment
 Bundle-SymbolicName: javax.media.opengl.win32
-Bundle-Version: 1.1.0
+Bundle-Version: 1.1.1
 Bundle-Vendor: Raytheon-bundled OSS
-Fragment-Host: javax.media.opengl;bundle-version="1.1.0"
+Fragment-Host: javax.media.opengl;bundle-version="1.1.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86))
diff --git a/cots/javax.media.opengl/META-INF/MANIFEST.MF b/cots/javax.media.opengl/META-INF/MANIFEST.MF
index 80f0d6b0d0..804f088c7a 100644
--- a/cots/javax.media.opengl/META-INF/MANIFEST.MF
+++ b/cots/javax.media.opengl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: OpenGL Plug-in
 Bundle-SymbolicName: javax.media.opengl
-Bundle-Version: 1.1.0
+Bundle-Version: 1.1.1
 Bundle-ClassPath: gluegen-rt.jar,
  jogl.jar
 Export-Package: com.sun.gluegen.runtime,
diff --git a/cots/javax.persistence/META-INF/MANIFEST.MF b/cots/javax.persistence/META-INF/MANIFEST.MF
index e24a885a0c..d0be910a38 100644
--- a/cots/javax.persistence/META-INF/MANIFEST.MF
+++ b/cots/javax.persistence/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Persistence Plug-in
 Bundle-SymbolicName: javax.persistence
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.0
 Export-Package: javax.persistence,
  javax.persistence.spi
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/cots/net.sf.ehcache/META-INF/MANIFEST.MF b/cots/net.sf.ehcache/META-INF/MANIFEST.MF
index 4b1b451fbc..83e1c98c6a 100644
--- a/cots/net.sf.ehcache/META-INF/MANIFEST.MF
+++ b/cots/net.sf.ehcache/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Ehcache Plug-in
 Bundle-SymbolicName: net.sf.ehcache
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.3.0
 Bundle-ClassPath: ehcache-1.3.0.jar
 Export-Package: net.sf.ehcache,
  net.sf.ehcache.bootstrap,
diff --git a/cots/net.sf.swtaddons/META-INF/MANIFEST.MF b/cots/net.sf.swtaddons/META-INF/MANIFEST.MF
index be72accb3d..d16bae8419 100644
--- a/cots/net.sf.swtaddons/META-INF/MANIFEST.MF
+++ b/cots/net.sf.swtaddons/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Swtaddons Plug-in
 Bundle-SymbolicName: net.sf.swtaddons
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.1.1
 Export-Package: net.sf.swtaddons.autocomplete,
  net.sf.swtaddons.autocomplete.combo,
  net.sf.swtaddons.autocomplete.text
diff --git a/cots/org.apache.activemq/META-INF/MANIFEST.MF b/cots/org.apache.activemq/META-INF/MANIFEST.MF
index e7294c5dce..e1ea31cd7a 100644
--- a/cots/org.apache.activemq/META-INF/MANIFEST.MF
+++ b/cots/org.apache.activemq/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Activemq Plug-in
 Bundle-SymbolicName: org.apache.activemq
-Bundle-Version: 5.2.0
+Bundle-Version: 5.3.0
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: .,
  activation-1.1.jar,
diff --git a/cots/org.apache.commons.codec/META-INF/MANIFEST.MF b/cots/org.apache.commons.codec/META-INF/MANIFEST.MF
index 0f7dc6230a..a0545d5fc1 100644
--- a/cots/org.apache.commons.codec/META-INF/MANIFEST.MF
+++ b/cots/org.apache.commons.codec/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Apache Commons Codec Plug-in
 Bundle-SymbolicName: org.apache.commons.codec
-Bundle-Version: 1.4
+Bundle-Version: 1.4.0
 Bundle-ClassPath: commons-codec-1.4.jar
 Export-Package: org.apache.commons.codec,
  org.apache.commons.codec.binary,
diff --git a/cots/org.apache.commons.cxf/META-INF/MANIFEST.MF b/cots/org.apache.commons.cxf/META-INF/MANIFEST.MF
index 8d78af960a..44a66f6069 100644
--- a/cots/org.apache.commons.cxf/META-INF/MANIFEST.MF
+++ b/cots/org.apache.commons.cxf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Cxf
 Bundle-SymbolicName: org.apache.commons.cxf
-Bundle-Version: 2.5.10.qualifier
+Bundle-Version: 2.5.10
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: FastInfoset-1.2.9.jar,
  geronimo-activation_1.1_spec-1.1.jar,
diff --git a/cots/org.apache.commons.io/META-INF/MANIFEST.MF b/cots/org.apache.commons.io/META-INF/MANIFEST.MF
index 20e9dd30f5..8f39124bd8 100644
--- a/cots/org.apache.commons.io/META-INF/MANIFEST.MF
+++ b/cots/org.apache.commons.io/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Io
 Bundle-SymbolicName: org.apache.commons.io
-Bundle-Version: 2.4
+Bundle-Version: 2.4.0
 Bundle-ClassPath: commons-io-2.4.jar
 Bundle-Vendor: Apache
 Export-Package: org.apache.commons.io,
diff --git a/cots/org.apache.commons.management/META-INF/MANIFEST.MF b/cots/org.apache.commons.management/META-INF/MANIFEST.MF
index a68c7cd408..3e03e23dfd 100644
--- a/cots/org.apache.commons.management/META-INF/MANIFEST.MF
+++ b/cots/org.apache.commons.management/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Management Plug-in
 Bundle-SymbolicName: org.apache.commons.management
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.0
 Bundle-ClassPath: commons-management-1.0.jar
 Export-Package: org.fusesource.commons.management,
  org.fusesource.commons.management.basic,
diff --git a/cots/org.apache.mina/META-INF/MANIFEST.MF b/cots/org.apache.mina/META-INF/MANIFEST.MF
index 26cbcb331b..7f51f824fa 100644
--- a/cots/org.apache.mina/META-INF/MANIFEST.MF
+++ b/cots/org.apache.mina/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mina Plug-in
 Bundle-SymbolicName: org.apache.mina
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.7
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.slf4j
 Bundle-ClassPath: mina-core-1.1.7.jar,
diff --git a/cots/org.apache.qpid/META-INF/MANIFEST.MF b/cots/org.apache.qpid/META-INF/MANIFEST.MF
index 838e561d2d..fd09392426 100644
--- a/cots/org.apache.qpid/META-INF/MANIFEST.MF
+++ b/cots/org.apache.qpid/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Qpid
 Bundle-SymbolicName: org.apache.qpid
-Bundle-Version: 1.0.0.18
+Bundle-Version: 0.18.0
 Require-Bundle: javax.jms;bundle-version="1.0.0",
  org.slf4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/cots/org.dom4j/META-INF/MANIFEST.MF b/cots/org.dom4j/META-INF/MANIFEST.MF
index ef1745e887..72582f9a8a 100644
--- a/cots/org.dom4j/META-INF/MANIFEST.MF
+++ b/cots/org.dom4j/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Dom4j Plug-in
 Bundle-SymbolicName: org.dom4j
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.6.1
 Bundle-ClassPath: dom4j-1.6.1.jar,
  jaxen-1.1.4.jar,
  .
diff --git a/cots/org.eclipse.jetty/META-INF/MANIFEST.MF b/cots/org.eclipse.jetty/META-INF/MANIFEST.MF
index fbf24eb70e..632b185a25 100644
--- a/cots/org.eclipse.jetty/META-INF/MANIFEST.MF
+++ b/cots/org.eclipse.jetty/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse Jetty
 Bundle-SymbolicName: org.eclipse.jetty
-Bundle-Version: 7.6.9.v20130131
+Bundle-Version: 7.6.14.v20131031
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: javax.el,
  javax.servlet,
diff --git a/cots/org.hibernate/META-INF/MANIFEST.MF b/cots/org.hibernate/META-INF/MANIFEST.MF
index 362af709bf..7d7b9c1e54 100644
--- a/cots/org.hibernate/META-INF/MANIFEST.MF
+++ b/cots/org.hibernate/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Hibernate Plug-in
 Bundle-SymbolicName: org.hibernate
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 3.5.6
 Bundle-ClassPath: hibernate-spatial-1.0.jar,
  hibernate-spatial-postgis-1.0.jar,
  hibernate3.5.6-Final.jar,
diff --git a/cots/org.jep.linux32/META-INF/MANIFEST.MF b/cots/org.jep.linux32/META-INF/MANIFEST.MF
index 88e2a29bb2..c47ef83dc9 100644
--- a/cots/org.jep.linux32/META-INF/MANIFEST.MF
+++ b/cots/org.jep.linux32/META-INF/MANIFEST.MF
@@ -2,8 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Native Jep Library 32-bit
 Bundle-SymbolicName: org.jep.linux32
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.3.0
 Bundle-Vendor: Raytheon-bundled OSS
+Bundle-ClassPath: libjep.so 
 Fragment-Host: org.jep;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86))
diff --git a/cots/org.jep.linux64/META-INF/MANIFEST.MF b/cots/org.jep.linux64/META-INF/MANIFEST.MF
index 82c04fdd90..eedaab65fd 100644
--- a/cots/org.jep.linux64/META-INF/MANIFEST.MF
+++ b/cots/org.jep.linux64/META-INF/MANIFEST.MF
@@ -2,8 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Native Jep Library 64-bit
 Bundle-SymbolicName: org.jep.linux64
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.3.0
 Bundle-Vendor: Raytheon-bundled OSS
+Bundle-ClassPath: libjep.so
 Fragment-Host: org.jep;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
diff --git a/cots/org.jep.win32/META-INF/MANIFEST.MF b/cots/org.jep.win32/META-INF/MANIFEST.MF
index 459b54f53c..1127fd9f6b 100644
--- a/cots/org.jep.win32/META-INF/MANIFEST.MF
+++ b/cots/org.jep.win32/META-INF/MANIFEST.MF
@@ -2,7 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Win32 Native Jep Library 32-bit
 Bundle-SymbolicName: org.jep.win32
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.3.0
+Bundle-ClassPath: jep.dll
 Fragment-Host: org.jep;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86))
diff --git a/cots/org.jep/META-INF/MANIFEST.MF b/cots/org.jep/META-INF/MANIFEST.MF
index 051531a481..1da881df4a 100644
--- a/cots/org.jep/META-INF/MANIFEST.MF
+++ b/cots/org.jep/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Jep Plug-in
 Bundle-SymbolicName: org.jep
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.3.0
 Bundle-Vendor: Raytheon-bundled OSS
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: jep.jar
diff --git a/cots/org.postgres/META-INF/MANIFEST.MF b/cots/org.postgres/META-INF/MANIFEST.MF
index 9f008a949f..e3568ff481 100644
--- a/cots/org.postgres/META-INF/MANIFEST.MF
+++ b/cots/org.postgres/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Postgres
 Bundle-SymbolicName: org.postgres
-Bundle-Version: 9.2
+Bundle-Version: 9.2.4
 Bundle-ClassPath: postgis-jdbc-2.0.2SVN.jar,
  postgresql-9.2-1002.jdbc4.jar
 Export-Package: examples,
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/build.properties b/edexOsgi/com.raytheon.edex.plugin.grib/build.properties
index b42694a640..bd0ae87d40 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/build.properties
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/build.properties
@@ -3,4 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                res/,\
-               GribDecoder.py
+               GribDecoder.py,\
+               resources/,\
+               utility/
diff --git a/edexOsgi/com.raytheon.edex.utilitysrv/build.properties b/edexOsgi/com.raytheon.edex.utilitysrv/build.properties
index 5791d48d5f..73974cda80 100644
--- a/edexOsgi/com.raytheon.edex.utilitysrv/build.properties
+++ b/edexOsgi/com.raytheon.edex.utilitysrv/build.properties
@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               res/
+               res/,\
+               utility/
diff --git a/edexOsgi/com.raytheon.uf.common.base.feature/feature.xml b/edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
index a7e98c7eea..6178d12af2 100644
--- a/edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
@@ -21,13 +21,13 @@
          id="org.apache.thrift"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="0.9.0"/>
 
    <plugin
          id="com.google.guava"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="11.0.2"/>
 
    <plugin
          id="com.raytheon.uf.common.alertmonitor"
@@ -196,104 +196,104 @@
          id="javax.jms"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="1.1.1"/>
 
    <plugin
          id="javax.measure"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="1.0.0"/>
 
    <plugin
          id="javax.persistence"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="1.0.0"/>
 
    <plugin
          id="javax.vecmath"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="1.3.1"/>
 
    <plugin
          id="net.sf.cglib"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="2.1.3"/>
 
    <plugin
          id="org.apache.commons.beanutils"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="1.8.3"/>
 
    <plugin
          id="org.apache.commons.codec"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="1.4.0"/>
 
    <plugin
          id="org.apache.commons.collections"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="3.2.0"/>
 
    <plugin
          id="org.apache.commons.configuration"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="1.6.0"/>
 
    <plugin
          id="org.apache.commons.digester"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="1.8.1"/>
 
    <plugin
          id="org.apache.commons.lang"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.3.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.http"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="4.1.2"/>
 
    <plugin
          id="org.apache.velocity"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="1.7.0"/>
 
    <plugin
          id="org.geotools"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="2.6.4"/>
 
    <plugin
          id="org.javassist"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="3.9.0.GA"/>
 
    <plugin
          id="org.hibernate"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="3.5.6"/>
 
    <plugin
          id="org.jep"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="2.3.0"/>
 
    <plugin
          id="org.jep.linux32"
@@ -301,7 +301,7 @@
          arch="x86"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.3.0"
          fragment="true"/>
 
    <plugin
@@ -310,7 +310,7 @@
          arch="x86_64"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.3.0"
          fragment="true"/>
 
    <plugin
@@ -319,26 +319,26 @@
          arch="x86"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.3.0"
          fragment="true"/>
 
    <plugin
          id="org.postgres"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="9.2.4"/>
 
    <plugin
          id="org.slf4j"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="1.7.5"/>
 
    <plugin
          id="org.springframework"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="3.1.4"/>
 
    <plugin
          id="com.raytheon.uf.common.pypies"
@@ -372,31 +372,31 @@
          id="org.apache.qpid"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="0.18.0"/>
 
    <plugin
          id="org.apache.mina"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="1.1.7"/>
 
    <plugin
          id="org.quartz"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="1.8.6"/>
 
    <plugin
          id="org.apache.commons.io"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="2.4.0"/>
 
    <plugin
          id="ch.qos.logback"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="1.0.13"/>
 
    <plugin
          id="com.raytheon.uf.common.topo"
@@ -416,5 +416,5 @@
          id="org.reflections"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="0.9.9"/>
 </feature>
diff --git a/edexOsgi/com.raytheon.uf.common.datadelivery.event/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.datadelivery.event/META-INF/MANIFEST.MF
index ad05a9f3cb..3a19a668ba 100644
--- a/edexOsgi/com.raytheon.uf.common.datadelivery.event/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.datadelivery.event/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
 Export-Package: com.raytheon.uf.common.datadelivery.event,
  com.raytheon.uf.common.datadelivery.event.notification,
  com.raytheon.uf.common.datadelivery.event.retrieval,
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.level/build.properties b/edexOsgi/com.raytheon.uf.common.dataplugin.level/build.properties
index 34d2e4d2da..544aa7de88 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.level/build.properties
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.level/build.properties
@@ -1,4 +1,5 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               utility/
diff --git a/edexOsgi/com.raytheon.uf.common.python/build.properties b/edexOsgi/com.raytheon.uf.common.python/build.properties
index 8e26798156..d1910bad5f 100644
--- a/edexOsgi/com.raytheon.uf.common.python/build.properties
+++ b/edexOsgi/com.raytheon.uf.common.python/build.properties
@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               JavaImporter.py
+               JavaImporter.py,\
+               utility/
diff --git a/edexOsgi/com.raytheon.uf.common.registry.ebxml/build.properties b/edexOsgi/com.raytheon.uf.common.registry.ebxml/build.properties
index 5791d48d5f..ad8d78badb 100644
--- a/edexOsgi/com.raytheon.uf.common.registry.ebxml/build.properties
+++ b/edexOsgi/com.raytheon.uf.common.registry.ebxml/build.properties
@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               res/
+               res/,\
+               resources/
diff --git a/edexOsgi/com.raytheon.uf.common.status/build.properties b/edexOsgi/com.raytheon.uf.common.status/build.properties
index 34d2e4d2da..544aa7de88 100644
--- a/edexOsgi/com.raytheon.uf.common.status/build.properties
+++ b/edexOsgi/com.raytheon.uf.common.status/build.properties
@@ -1,4 +1,5 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               utility/
diff --git a/edexOsgi/com.raytheon.uf.common.time/build.properties b/edexOsgi/com.raytheon.uf.common.time/build.properties
index 5791d48d5f..73974cda80 100644
--- a/edexOsgi/com.raytheon.uf.common.time/build.properties
+++ b/edexOsgi/com.raytheon.uf.common.time/build.properties
@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               res/
+               res/,\
+               utility/
diff --git a/edexOsgi/com.raytheon.uf.common.topo/build.properties b/edexOsgi/com.raytheon.uf.common.topo/build.properties
index 34d2e4d2da..544aa7de88 100644
--- a/edexOsgi/com.raytheon.uf.common.topo/build.properties
+++ b/edexOsgi/com.raytheon.uf.common.topo/build.properties
@@ -1,4 +1,5 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               utility/
diff --git a/edexOsgi/com.raytheon.uf.edex.archive/build.properties b/edexOsgi/com.raytheon.uf.edex.archive/build.properties
index 5791d48d5f..575eb87e54 100644
--- a/edexOsgi/com.raytheon.uf.edex.archive/build.properties
+++ b/edexOsgi/com.raytheon.uf.edex.archive/build.properties
@@ -2,4 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               res/
+               res/,\
+               utility/,\
+               resources/
diff --git a/edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml
index 6862aaabed..1e485c4c47 100644
--- a/edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml
@@ -25,7 +25,7 @@
          id="com.mchange"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="0.9.1"/>
 
    <plugin
          id="com.raytheon.edex.common"
@@ -150,37 +150,37 @@
          id="net.sf.ehcache"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="1.3.0"/>
 
    <plugin
          id="org.apache.camel"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="2.11.2"/>
 
    <plugin
          id="org.apache.commons.cxf"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.5.10"
          unpack="false"/>
 
    <plugin
          id="org.apache.commons.management"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="1.0.0"/>
 
    <plugin
          id="org.dom4j"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="1.6.1"/>
 
    <plugin
          id="org.eclipse.jetty"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="7.6.14.v20131031"/>
 
 </feature>
diff --git a/edexOsgi/com.raytheon.uf.edex.database/build.properties b/edexOsgi/com.raytheon.uf.edex.database/build.properties
index 5791d48d5f..73974cda80 100644
--- a/edexOsgi/com.raytheon.uf.edex.database/build.properties
+++ b/edexOsgi/com.raytheon.uf.edex.database/build.properties
@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               res/
+               res/,\
+               utility/
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/build.properties b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/build.properties
index 115a02a034..ea51e0ae82 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/build.properties
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/build.properties
@@ -1,4 +1,5 @@
 source.. = src/
 bin.includes = META-INF/,\
                .,\
-               res/
+               res/,\
+               resources/
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/build.properties b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/build.properties
index 5791d48d5f..575eb87e54 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/build.properties
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/build.properties
@@ -2,4 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               res/
+               res/,\
+               utility/,\
+               resources/
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/build.properties b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/build.properties
index 5791d48d5f..548582a528 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/build.properties
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/build.properties
@@ -2,4 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               res/
+               res/,\
+               resources/,\
+               utility/
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/build.properties b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/build.properties
index 5791d48d5f..548582a528 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/build.properties
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/build.properties
@@ -2,4 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               res/
+               res/,\
+               resources/,\
+               utility/
diff --git a/edexOsgi/com.raytheon.uf.edex.event/build.properties b/edexOsgi/com.raytheon.uf.edex.event/build.properties
index 5791d48d5f..ad8d78badb 100644
--- a/edexOsgi/com.raytheon.uf.edex.event/build.properties
+++ b/edexOsgi/com.raytheon.uf.edex.event/build.properties
@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               res/
+               res/,\
+               resources/
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/build.properties b/edexOsgi/com.raytheon.uf.edex.ohd/build.properties
index 5791d48d5f..548582a528 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/build.properties
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/build.properties
@@ -2,4 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               res/
+               res/,\
+               resources/,\
+               utility/
diff --git a/edexOsgi/com.raytheon.uf.edex.pointdata/build.properties b/edexOsgi/com.raytheon.uf.edex.pointdata/build.properties
index 5791d48d5f..73974cda80 100644
--- a/edexOsgi/com.raytheon.uf.edex.pointdata/build.properties
+++ b/edexOsgi/com.raytheon.uf.edex.pointdata/build.properties
@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               res/
+               res/,\
+               utility/
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/build.properties b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/build.properties
index 5791d48d5f..575eb87e54 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/build.properties
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/build.properties
@@ -2,4 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               res/
+               res/,\
+               utility/,\
+               resources/
diff --git a/edexOsgi/com.raytheon.uf.edex.stats/build.properties b/edexOsgi/com.raytheon.uf.edex.stats/build.properties
index 5791d48d5f..548582a528 100644
--- a/edexOsgi/com.raytheon.uf.edex.stats/build.properties
+++ b/edexOsgi/com.raytheon.uf.edex.stats/build.properties
@@ -2,4 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               res/
+               res/,\
+               resources/,\
+               utility/
diff --git a/ncep/gov.noaa.nws.ncep.gempak.parameters/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.gempak.parameters/META-INF/MANIFEST.MF
index 70c12dabf6..cab24d573b 100644
--- a/ncep/gov.noaa.nws.ncep.gempak.parameters/META-INF/MANIFEST.MF
+++ b/ncep/gov.noaa.nws.ncep.gempak.parameters/META-INF/MANIFEST.MF
@@ -31,4 +31,3 @@ Export-Package: gov.noaa.nws.ncep.gempak.parameters,
  gov.noaa.nws.ncep.gempak.parameters.line,
  gov.noaa.nws.ncep.gempak.parameters.marker,
  gov.noaa.nws.ncep.gempak.parameters.title
-Bundle-ClassPath: ., jna.jar
diff --git a/ncep/gov.noaa.nws.ncep.ui.nsharp/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.ui.nsharp/META-INF/MANIFEST.MF
index 6984f951dd..f5eacecb35 100644
--- a/ncep/gov.noaa.nws.ncep.ui.nsharp/META-INF/MANIFEST.MF
+++ b/ncep/gov.noaa.nws.ncep.ui.nsharp/META-INF/MANIFEST.MF
@@ -63,5 +63,3 @@ Export-Package: gov.noaa.nws.ncep.ui.nsharp,
  gov.noaa.nws.ncep.ui.nsharp.display.rsc,
  gov.noaa.nws.ncep.ui.nsharp.natives,
  gov.noaa.nws.ncep.ui.nsharp.view
-Bundle-ClassPath: .,
- jna.jar
diff --git a/ncep/gov.noaa.nws.ncep.ui.pgen/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.ui.pgen/META-INF/MANIFEST.MF
index 19c5509f74..2c38a9fa91 100644
--- a/ncep/gov.noaa.nws.ncep.ui.pgen/META-INF/MANIFEST.MF
+++ b/ncep/gov.noaa.nws.ncep.ui.pgen/META-INF/MANIFEST.MF
@@ -44,4 +44,3 @@ Import-Package: com.raytheon.viz.core.contours.util,
  com.raytheon.viz.core.gl.images,
  gov.noaa.nws.ncep.common.staticdata,
  javax.measure.unit
-Bundle-ClassPath: .
diff --git a/ncep/gov.noaa.nws.ncep.viz.tools/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.viz.tools/META-INF/MANIFEST.MF
index 9ad75df1a9..cb5c189933 100644
--- a/ncep/gov.noaa.nws.ncep.viz.tools/META-INF/MANIFEST.MF
+++ b/ncep/gov.noaa.nws.ncep.viz.tools/META-INF/MANIFEST.MF
@@ -46,7 +46,6 @@ Export-Package: gov.noaa.nws.ncep.viz.tools,
  gov.noaa.nws.ncep.viz.tools.newEditors,
  gov.noaa.nws.ncep.viz.tools.panZoom,
  gov.noaa.nws.ncep.viz.tools.predefinedArea
-Bundle-ClassPath: .
 Import-Package: gov.noaa.nws.ncep.common.log.logger,
  gov.noaa.nws.ncep.edex.common.ncinventory,
  gov.noaa.nws.ncep.viz.gempak.grid.inv,