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"/>
+ version="0.1.1"/>
+ version="1.1.1"/>
+ version="0.9.0"/>
+ version="11.0.2"/>
+ version="1.1.1"/>
+ version="1.0.0"/>
+ version="1.0.0"/>
+ version="1.3.1"/>
+ version="2.1.3"/>
+ version="1.8.3"/>
+ version="1.4.0"/>
+ version="3.2.0"/>
+ version="1.6.0"/>
+ version="1.8.1"/>
+ version="4.1.2"/>
+ version="1.7.0"/>
+ version="2.6.4"/>
+ version="3.9.0.GA"/>
+ version="3.5.6"/>
+ version="2.3.0"/>
+ version="9.2.4"/>
+ version="1.7.5"/>
+ version="3.1.4"/>
+ version="0.18.0"/>
+ version="1.1.7"/>
+ version="1.8.6"/>
+ version="2.4.0"/>
+ version="1.0.13"/>
+ version="0.9.9"/>
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"/>
+ version="1.3.0"/>
+ version="2.11.2"/>
+ version="1.0.0"/>
+ version="1.6.1"/>
+ version="7.6.14.v20131031"/>
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,