diff --git a/cave/com.raytheon.uf.viz.core/res/spring/viz.xml b/cave/com.raytheon.uf.viz.core/res/spring/viz.xml
index d717b020e3..ceb8bdc277 100644
--- a/cave/com.raytheon.uf.viz.core/res/spring/viz.xml
+++ b/cave/com.raytheon.uf.viz.core/res/spring/viz.xml
@@ -3,10 +3,10 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:context="http://www.springframework.org/schema/context"
   xmlns:util="http://www.springframework.org/schema/util"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd   
-  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
+  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
   http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+  http://www.springframework.org/schema/util/spring-util-3.1.xsd">
   
     <bean id="caveCredentialHandler" class="com.raytheon.uf.viz.core.comm.CaveHttpsCredentialsHandler" />
     
diff --git a/cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery-handlers.xml b/cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery-handlers.xml
index 4d65892ed8..f07a2434dc 100644
--- a/cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery-handlers.xml
+++ b/cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery-handlers.xml
@@ -1,7 +1,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
 
     <!-- Creation of the handlers -->
     <bean name="SubscriptionHandler"
diff --git a/cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery-services.xml b/cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery-services.xml
index 27841fb18a..63fff42fa1 100644
--- a/cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery-services.xml
+++ b/cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery-services.xml
@@ -1,8 +1,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
 
     <bean id="bandwidthService"
         class="com.raytheon.uf.common.datadelivery.bandwidth.WfoBandwidthService" />
diff --git a/cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery.xml b/cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery.xml
index 3a9ccee31e..85bf5f83e4 100644
--- a/cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery.xml
+++ b/cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery.xml
@@ -2,10 +2,10 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
   http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+  http://www.springframework.org/schema/util/spring-util-3.1.xsd">
     
     <bean id="registryHandler"
         class="com.raytheon.uf.common.registry.ebxml.ThriftRegistryHandler" />
diff --git a/cave/com.raytheon.viz.gfe/res/spring/gfe.xml b/cave/com.raytheon.viz.gfe/res/spring/gfe.xml
index 3a33ec5d12..dec76c009a 100644
--- a/cave/com.raytheon.viz.gfe/res/spring/gfe.xml
+++ b/cave/com.raytheon.viz.gfe/res/spring/gfe.xml
@@ -3,10 +3,10 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:context="http://www.springframework.org/schema/context"
   xmlns:util="http://www.springframework.org/schema/util"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd   
-  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
+  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
   http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+  http://www.springframework.org/schema/util/spring-util-3.1.xsd">
   
         <bean id="gfeClientConfig" class="com.raytheon.viz.gfe.core.GfeClientConfig" factory-method="getInstance">
            <property name="maxSaveThreads" value="3"/>
diff --git a/edexOsgi/build.edex/esb/conf/spring/edex-db.xml b/edexOsgi/build.edex/esb/conf/spring/edex-db.xml
index 3a79190948..3c38129e5c 100644
--- a/edexOsgi/build.edex/esb/conf/spring/edex-db.xml
+++ b/edexOsgi/build.edex/esb/conf/spring/edex-db.xml
@@ -2,11 +2,11 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:util="http://www.springframework.org/schema/util" xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd   
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
+  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
   http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-2.5.xsd
+  http://www.springframework.org/schema/util/spring-util-3.1.xsd
   http://www.springframework.org/schema/tx
   http://www.springframework.org/schema/tx/spring-tx.xsd">
 
diff --git a/edexOsgi/build.edex/esb/conf/spring/edex.xml b/edexOsgi/build.edex/esb/conf/spring/edex.xml
index c624f4542b..5a318a163e 100644
--- a/edexOsgi/build.edex/esb/conf/spring/edex.xml
+++ b/edexOsgi/build.edex/esb/conf/spring/edex.xml
@@ -5,11 +5,11 @@
   xmlns:context="http://www.springframework.org/schema/context"
   xmlns:util="http://www.springframework.org/schema/util"
   xmlns:tx="http://www.springframework.org/schema/tx"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd   
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
+  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
   http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-2.5.xsd
+  http://www.springframework.org/schema/util/spring-util-3.1.xsd
   http://www.springframework.org/schema/tx
   http://www.springframework.org/schema/tx/spring-tx.xsd">
   
diff --git a/edexOsgi/build.edex/esb/etc/ingestDat.sh b/edexOsgi/build.edex/esb/etc/ingestDat.sh
index 85400eab6b..473b30db5d 100644
--- a/edexOsgi/build.edex/esb/etc/ingestDat.sh
+++ b/edexOsgi/build.edex/esb/etc/ingestDat.sh
@@ -19,12 +19,7 @@
 # further licensing information.
 ##
 export INIT_MEM=256 # in Meg
-
-if [ $HIGH_MEM_FLAG == "on" ]; then
-    export MAX_MEM=1792 # in Meg
-else
-    export MAX_MEM=768 # in Meg
-fi
+export MAX_MEM=1792 # in Meg
 
 export JMS_POOL_MIN=16
 export JMS_POOL_MAX=32
diff --git a/edexOsgi/build.edex/esb/webapps/admin/WEB-INF/webconsole-default.xml b/edexOsgi/build.edex/esb/webapps/admin/WEB-INF/webconsole-default.xml
index 68288cef07..4fe67d1e22 100644
--- a/edexOsgi/build.edex/esb/webapps/admin/WEB-INF/webconsole-default.xml
+++ b/edexOsgi/build.edex/esb/webapps/admin/WEB-INF/webconsole-default.xml
@@ -36,8 +36,8 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:aop="http://www.springframework.org/schema/aop"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-                           http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+                           http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd">
 
 
   <import resource="webconsole-jndi.xml"/>
diff --git a/edexOsgi/build.edex/esb/webapps/admin/WEB-INF/webconsole-invm.xml b/edexOsgi/build.edex/esb/webapps/admin/WEB-INF/webconsole-invm.xml
index c1ad34bc26..bf5199cf66 100644
--- a/edexOsgi/build.edex/esb/webapps/admin/WEB-INF/webconsole-invm.xml
+++ b/edexOsgi/build.edex/esb/webapps/admin/WEB-INF/webconsole-invm.xml
@@ -36,8 +36,8 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:aop="http://www.springframework.org/schema/aop"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-                           http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+                           http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd">
 
   <bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
   
diff --git a/edexOsgi/build.edex/esb/webapps/admin/WEB-INF/webconsole-jndi.xml b/edexOsgi/build.edex/esb/webapps/admin/WEB-INF/webconsole-jndi.xml
index ee813d6da1..b6e2feaeef 100644
--- a/edexOsgi/build.edex/esb/webapps/admin/WEB-INF/webconsole-jndi.xml
+++ b/edexOsgi/build.edex/esb/webapps/admin/WEB-INF/webconsole-jndi.xml
@@ -36,8 +36,8 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:aop="http://www.springframework.org/schema/aop"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-                           http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+                           http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd">
 
   <bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
   
diff --git a/edexOsgi/build.edex/esb/webapps/admin/WEB-INF/webconsole-properties.xml b/edexOsgi/build.edex/esb/webapps/admin/WEB-INF/webconsole-properties.xml
index 1f83cecdb1..a68bdaf283 100644
--- a/edexOsgi/build.edex/esb/webapps/admin/WEB-INF/webconsole-properties.xml
+++ b/edexOsgi/build.edex/esb/webapps/admin/WEB-INF/webconsole-properties.xml
@@ -36,8 +36,8 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:aop="http://www.springframework.org/schema/aop"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-                           http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+                           http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd">
 
   <bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
   
diff --git a/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-common.xml b/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-common.xml
index 259b4c9d77..1cef377fea 100644
--- a/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-common.xml
+++ b/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="subscriptionDao" class="com.raytheon.edex.subscription.dao.SubscriptionDAO">
diff --git a/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-request.xml b/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-request.xml
index 9a9685cc57..789fd319d9 100644
--- a/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-request.xml
+++ b/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-request.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="subscription" class="com.raytheon.edex.services.SubscribeManager"/>
diff --git a/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-spring.xml b/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-spring.xml
index 20a6923af3..bbb0c7c3ed 100644
--- a/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-spring.xml
+++ b/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-spring.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<!-- define the bean that handles Quartz scheduled script running -->
diff --git a/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml b/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
index f0a41a1caf..ca32da1f75 100644
--- a/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
@@ -2,9 +2,9 @@
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:context="http://www.springframework.org/schema/context"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
   
   
   	<bean id="uriAggregator" class="com.raytheon.uf.edex.esb.camel.DataUriAggregator" />
diff --git a/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-request.xml b/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-request.xml
index 9d225e2a00..0002205238 100644
--- a/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-request.xml
+++ b/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-request.xml
@@ -2,9 +2,9 @@
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:context="http://www.springframework.org/schema/context"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
     
    <bean id="index" class="com.raytheon.edex.services.IndexSrv"/>        
   
diff --git a/edexOsgi/com.raytheon.edex.monitorsrv/res/spring/jmx-log4j-manager-spring.xml b/edexOsgi/com.raytheon.edex.monitorsrv/res/spring/jmx-log4j-manager-spring.xml
index 8faa989d94..b11079c906 100644
--- a/edexOsgi/com.raytheon.edex.monitorsrv/res/spring/jmx-log4j-manager-spring.xml
+++ b/edexOsgi/com.raytheon.edex.monitorsrv/res/spring/jmx-log4j-manager-spring.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="jmxExporter"
 		class="org.springframework.jmx.export.MBeanExporter">
diff --git a/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-common.xml b/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-common.xml
index ba5e20aa24..b999aaae65 100644
--- a/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="airepPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
index db802d8d25..46bb6266c0 100644
--- a/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="airepDecoder" class="com.raytheon.edex.plugin.airep.AirepDecoder">
diff --git a/edexOsgi/com.raytheon.edex.plugin.binlightning/res/spring/binlightning-common.xml b/edexOsgi/com.raytheon.edex.plugin.binlightning/res/spring/binlightning-common.xml
index 0e0881f1b7..2571e03214 100644
--- a/edexOsgi/com.raytheon.edex.plugin.binlightning/res/spring/binlightning-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.binlightning/res/spring/binlightning-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="binlightningProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
diff --git a/edexOsgi/com.raytheon.edex.plugin.binlightning/res/spring/binlightning_ep-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.binlightning/res/spring/binlightning_ep-ingest.xml
index a2e7eea51b..5dd0c4a632 100644
--- a/edexOsgi/com.raytheon.edex.plugin.binlightning/res/spring/binlightning_ep-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.binlightning/res/spring/binlightning_ep-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="binlightningDecoder"
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/res/spring/bufrmos-common.xml b/edexOsgi/com.raytheon.edex.plugin.bufrmos/res/spring/bufrmos-common.xml
index b356c55221..eb2a645a07 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/res/spring/bufrmos-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/res/spring/bufrmos-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="bufrmosAvnProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/res/spring/bufrmos-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.bufrmos/res/spring/bufrmos-ingest.xml
index bf331b0e0d..e68ebb31c9 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/res/spring/bufrmos-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/res/spring/bufrmos-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="bufrmosDecoder" class="com.raytheon.edex.plugin.bufrmos.BufrMosDecoder" />	
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-common.xml b/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-common.xml
index e4b3b1dc95..e22074a907 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="bufruaPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-ingest.xml
index 5b68c0e385..2e51fbf2ee 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="bufruaDecoder" class="com.raytheon.edex.plugin.bufrua.BufrUADecoder">
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-request.xml b/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-request.xml
index dc0f2124ed..fbcc8e7d00 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-request.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   	
   	<bean id="raobMenuUtil" class="com.raytheon.edex.plugin.bufrua.util.RaobMenuUtil" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-common.xml b/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-common.xml
index 36a0b217d6..32f0f7ab4a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-ingest.xml
index a2d5a482c7..74cb242db0 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ccfpDecoder" class="com.raytheon.edex.plugin.ccfp.CcfpDecoder" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
index b9e3adf4bc..cbccdca31b 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="gfeProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
index 326ae21529..2a3ed7a8e3 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="commitGridsHandler"
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
index d5b79a87fb..53600165bb 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   	
   	<bean id="smartInitQueue" class="com.raytheon.edex.plugin.gfe.smartinit.SmartInitQueue"/>
diff --git a/edexOsgi/com.raytheon.edex.plugin.goessounding/res/spring/goessounding-common.xml b/edexOsgi/com.raytheon.edex.plugin.goessounding/res/spring/goessounding-common.xml
index 30a35f0e5d..a72341e15a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.goessounding/res/spring/goessounding-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.goessounding/res/spring/goessounding-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="goessoundingPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.goessounding/res/spring/goessounding-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.goessounding/res/spring/goessounding-ingest.xml
index c873fad086..8e39f8db76 100644
--- a/edexOsgi/com.raytheon.edex.plugin.goessounding/res/spring/goessounding-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.goessounding/res/spring/goessounding-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="goessoundingDecoder"
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-common.xml b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-common.xml
index 9ca02f3ad4..4dde9797ef 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="gribPathProvider" class="com.raytheon.uf.common.dataplugin.grib.GribPathProvider" />
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
index 2afb8e3311..08dc221168 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="gribDecoder" class="com.raytheon.edex.plugin.grib.GribDecoder" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-request.xml b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-request.xml
index dae8c6dfea..dbe7111b1a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-request.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
    <bean id="gridDataQueryHandler" class="com.raytheon.edex.plugin.grib.handler.GridDataHandler" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-common.xml b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-common.xml
index 1192c22860..3b56331181 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 	<!-- In the future this file doesn't exist. -->
 
 </beans>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
index 5fc95dca5f..5963cb760c 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="gribDecoder" class="com.raytheon.edex.plugin.grib.GribDecoder" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-request.xml b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-request.xml
index 1192c22860..3b56331181 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-request.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 	<!-- In the future this file doesn't exist. -->
 
 </beans>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-common.xml b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-common.xml
index 0026740e5f..b4083e583d 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-common.xml
@@ -1,4 +1,4 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 	<import resource="../spring.${gribMode}/grib-common.xml" />
 </beans>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml
index f9e0ee7f96..f99d74cd75 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml
@@ -1,4 +1,4 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 	<import resource="../spring.${gribMode}/grib-decode.xml" />
 </beans>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
index 7e0743e86a..0ff0e5a294 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   	 <bean id="gribDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
index 37ad36ab10..913eb27e02 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
@@ -1,4 +1,4 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 	<import resource="../spring.${gribMode}/grib-request.xml" />
 </beans>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldad/res/spring/ldad-common.xml b/edexOsgi/com.raytheon.edex.plugin.ldad/res/spring/ldad-common.xml
index 7d2d47aafc..f6d2bbbe27 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldad/res/spring/ldad-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.ldad/res/spring/ldad-common.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="ldadPluginName" class="java.lang.String">
 		<constructor-arg type="java.lang.String" value="ldad" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldad/res/spring/ldad-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.ldad/res/spring/ldad-ingest.xml
index dda86095df..9f74180814 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldad/res/spring/ldad-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.ldad/res/spring/ldad-ingest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<!--  unused...
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/res/spring/ldadhydro-common.xml b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/res/spring/ldadhydro-common.xml
index 94128e40e1..14c242c2e8 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/res/spring/ldadhydro-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/res/spring/ldadhydro-common.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="hydroPluginName" class="java.lang.String">
 		<constructor-arg type="java.lang.String" value="ldadhydro" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/res/spring/ldadhydro-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/res/spring/ldadhydro-ingest.xml
index 2d7366926b..dfec7e9daa 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/res/spring/ldadhydro-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/res/spring/ldadhydro-ingest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="hydroDecoder" class="com.raytheon.edex.plugin.ldadhydro.dao.HydroDecoder">
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadmanual/res/spring/ldadmanual-common.xml b/edexOsgi/com.raytheon.edex.plugin.ldadmanual/res/spring/ldadmanual-common.xml
index 3e185e40f6..6a4eb5face 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldadmanual/res/spring/ldadmanual-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.ldadmanual/res/spring/ldadmanual-common.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="manualPluginName" class="java.lang.String">
 		<constructor-arg type="java.lang.String" value="ldadmanual" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadmanual/res/spring/ldadmanual-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.ldadmanual/res/spring/ldadmanual-ingest.xml
index d5004e0a96..58eadd4f56 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldadmanual/res/spring/ldadmanual-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.ldadmanual/res/spring/ldadmanual-ingest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">	
 	
 	<bean id="manualDecoder" class="com.raytheon.edex.plugin.ldadmanual.dao.ManualDecoder">
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/res/spring/ldadprofiler-common.xml b/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/res/spring/ldadprofiler-common.xml
index 81de862472..5e5fd64669 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/res/spring/ldadprofiler-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/res/spring/ldadprofiler-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ldadprofilerPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/res/spring/ldadprofiler-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/res/spring/ldadprofiler-ingest.xml
index bf0d173865..0b9b086a80 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/res/spring/ldadprofiler-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/res/spring/ldadprofiler-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">	
 
 	<bean id="ldadprofilerPointData" class="com.raytheon.edex.plugin.ldadprofiler.common.LdadprofilerPointDataTransform"/>
diff --git a/edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-common.xml b/edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-common.xml
index ada921214d..cb207bf94f 100644
--- a/edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="modelsoundingPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
index c7bc7a4df8..03234e7f67 100644
--- a/edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
     
 	<bean id="modelsoundingDecoder"
diff --git a/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-common.xml b/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-common.xml
index 8a7ddd0289..08e7d0e77d 100644
--- a/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="obsPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
index 71e917e905..fa8fe9b3f4 100644
--- a/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="obsDecoder" class="com.raytheon.edex.plugin.obs.ObsDecoder">
diff --git a/edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-common.xml b/edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-common.xml
index 8a3d4d6acc..637567168a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="pirepPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
index 9471526678..99a1c778c7 100644
--- a/edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="pirepDecoder" class="com.raytheon.edex.plugin.pirep.PirepDecoder">
diff --git a/edexOsgi/com.raytheon.edex.plugin.poessounding/res/spring/poessounding-common.xml b/edexOsgi/com.raytheon.edex.plugin.poessounding/res/spring/poessounding-common.xml
index 99bee9c990..3063de1cef 100644
--- a/edexOsgi/com.raytheon.edex.plugin.poessounding/res/spring/poessounding-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.poessounding/res/spring/poessounding-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="poessoundingPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.poessounding/res/spring/poessounding-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.poessounding/res/spring/poessounding-ingest.xml
index 0e4cf223a4..2cdf3aa4f3 100644
--- a/edexOsgi/com.raytheon.edex.plugin.poessounding/res/spring/poessounding-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.poessounding/res/spring/poessounding-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="poessoundingDecoder" class="com.raytheon.edex.plugin.poessounding.POESSoundingDecoder"/>
diff --git a/edexOsgi/com.raytheon.edex.plugin.profiler/res/spring/profiler-common.xml b/edexOsgi/com.raytheon.edex.plugin.profiler/res/spring/profiler-common.xml
index 5f21894ee3..64385886e7 100644
--- a/edexOsgi/com.raytheon.edex.plugin.profiler/res/spring/profiler-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.profiler/res/spring/profiler-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="profilerPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.profiler/res/spring/profiler-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.profiler/res/spring/profiler-ingest.xml
index fcd625314e..aa0354ede9 100644
--- a/edexOsgi/com.raytheon.edex.plugin.profiler/res/spring/profiler-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.profiler/res/spring/profiler-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="profilerDecoder" class="com.raytheon.edex.plugin.profiler.ProfilerDecoder"/>
diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-common.xml b/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-common.xml
index ac778657ca..ea358ca9d6 100644
--- a/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="radarPathProvider"
 		class="com.raytheon.uf.common.dataplugin.radar.RadarPathProvider" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml
index b2d14d17b5..e19a4b724f 100644
--- a/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="radarDecompressor" class="com.raytheon.edex.plugin.radar.RadarDecompressor"/>
diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-request.xml b/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-request.xml
index 891a782557..870afc59a3 100644
--- a/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-request.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
   	
diff --git a/edexOsgi/com.raytheon.edex.plugin.recco/res/spring/recco-common.xml b/edexOsgi/com.raytheon.edex.plugin.recco/res/spring/recco-common.xml
index 8f96323993..5983dbe178 100644
--- a/edexOsgi/com.raytheon.edex.plugin.recco/res/spring/recco-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.recco/res/spring/recco-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="reccoPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.recco/res/spring/recco-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.recco/res/spring/recco-ingest.xml
index 3484b0c50d..e5ab97ee84 100644
--- a/edexOsgi/com.raytheon.edex.plugin.recco/res/spring/recco-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.recco/res/spring/recco-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="reccoDecoder" class="com.raytheon.edex.plugin.recco.RECCODecoder">
diff --git a/edexOsgi/com.raytheon.edex.plugin.redbook/res/spring/redbook-common.xml b/edexOsgi/com.raytheon.edex.plugin.redbook/res/spring/redbook-common.xml
index b042329423..43f1f03fad 100644
--- a/edexOsgi/com.raytheon.edex.plugin.redbook/res/spring/redbook-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.redbook/res/spring/redbook-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="redbookPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.redbook/res/spring/redbook-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.redbook/res/spring/redbook-ingest.xml
index e41f5996da..01a9d8110f 100644
--- a/edexOsgi/com.raytheon.edex.plugin.redbook/res/spring/redbook-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.redbook/res/spring/redbook-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="redbookDecoder" class="com.raytheon.edex.plugin.redbook.RedbookDecoder">
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-common.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-common.xml
index 0773231749..93b87a61fc 100644
--- a/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="satelliteProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties" 
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml
index afb12cfb66..8b7de4f930 100644
--- a/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="jms-satellite" class="org.apache.camel.component.jms.JmsComponent">
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-request.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-request.xml
index d13459cde3..db75d2ab4f 100644
--- a/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-request.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="satelliteMenuUtil" class="com.raytheon.edex.util.satellite.SatelliteMenuUtil"/>
diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-common.xml b/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-common.xml
index dcc163fec7..31b55b4797 100644
--- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="sfcobsPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-ingest.xml
index 59cd4e8dfd..bf995c57cc 100644
--- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="sfcobsDecoder" class="com.raytheon.edex.plugin.sfcobs.SfcObsDecoder" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/alertalarm.xml b/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/alertalarm.xml
index 046b3e999d..4b9b101da0 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/alertalarm.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/alertalarm.xml
@@ -1,7 +1,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" 
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-	http://www.springframework.org/schema/beans/spring-beans-2.0.xsd  
+	http://www.springframework.org/schema/beans/spring-beans-3.1.xsd  
 	http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-common.xml b/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-common.xml
index 6b1683f584..cee6bdc8ef 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <!--  pluginFQN etc not set so as to not load hibernate objects into metadata -->
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
index 9d5ad17de3..9e9a388f92 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="jms-shef" class="org.apache.camel.component.jms.JmsComponent">
diff --git a/edexOsgi/com.raytheon.edex.plugin.taf/res/spring/taf-common.xml b/edexOsgi/com.raytheon.edex.plugin.taf/res/spring/taf-common.xml
index 285ebba684..6408d8707d 100644
--- a/edexOsgi/com.raytheon.edex.plugin.taf/res/spring/taf-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.taf/res/spring/taf-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="tafProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
diff --git a/edexOsgi/com.raytheon.edex.plugin.taf/res/spring/taf-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.taf/res/spring/taf-ingest.xml
index 9649a797c4..96305b45f2 100644
--- a/edexOsgi/com.raytheon.edex.plugin.taf/res/spring/taf-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.taf/res/spring/taf-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="tafDecoder" class="com.raytheon.edex.plugin.taf.TafDecoder" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-common.xml b/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-common.xml
index 601721d81e..10344a4011 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
   	<bean id="textProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-ingest.xml
index e56f5170e2..175358fef1 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="textDecoder" class="com.raytheon.edex.plugin.text.TextDecoder">
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-request.xml b/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-request.xml
index e6f7a40bec..0f77bf6d73 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-request.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
   	<bean id="getAfosIdHandler" class="com.raytheon.edex.plugin.text.handler.GetAfosIdHandler" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.textlightning/res/spring/textlightning_ep-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.textlightning/res/spring/textlightning_ep-ingest.xml
index 077eff3038..88bf13d050 100644
--- a/edexOsgi/com.raytheon.edex.plugin.textlightning/res/spring/textlightning_ep-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.textlightning/res/spring/textlightning_ep-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="textlightningDecoder"
diff --git a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-common.xml b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-common.xml
index 5ba7429221..2861dc58ad 100644
--- a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="warningProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
diff --git a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
index 6bc98b6ef4..5c100d59ad 100644
--- a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
 	<bean id="vtecFilter" class="com.raytheon.edex.plugin.warning.util.WarningHasVTECFilter" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
index 66e633ffe4..c1e9a77b54 100644
--- a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/edexOsgi/com.raytheon.edex.productsrv/res/spring/uengine-request.xml b/edexOsgi/com.raytheon.edex.productsrv/res/spring/uengine-request.xml
index 5882a19aca..3d145edeea 100644
--- a/edexOsgi/com.raytheon.edex.productsrv/res/spring/uengine-request.xml
+++ b/edexOsgi/com.raytheon.edex.productsrv/res/spring/uengine-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="pythonThreadPool" class="com.raytheon.edex.productsrv.PythonExecThreadPool"
diff --git a/edexOsgi/com.raytheon.edex.rpgenvdata/res/spring/rpgenvdata-request.xml b/edexOsgi/com.raytheon.edex.rpgenvdata/res/spring/rpgenvdata-request.xml
index 2793ed0ddd..e5bf70f142 100644
--- a/edexOsgi/com.raytheon.edex.rpgenvdata/res/spring/rpgenvdata-request.xml
+++ b/edexOsgi/com.raytheon.edex.rpgenvdata/res/spring/rpgenvdata-request.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="radarServerConnectionHandler"
diff --git a/edexOsgi/com.raytheon.edex.rpgenvdata/res/spring/rpgenvdata-spring.xml b/edexOsgi/com.raytheon.edex.rpgenvdata/res/spring/rpgenvdata-spring.xml
index 0f796499dc..ea76594d40 100644
--- a/edexOsgi/com.raytheon.edex.rpgenvdata/res/spring/rpgenvdata-spring.xml
+++ b/edexOsgi/com.raytheon.edex.rpgenvdata/res/spring/rpgenvdata-spring.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="envData" class="com.raytheon.edex.rpgenvdata.RPGEnvironmentalDataRunner" />
diff --git a/edexOsgi/com.raytheon.edex.textdb/res/spring/textdb-request.xml b/edexOsgi/com.raytheon.edex.textdb/res/spring/textdb-request.xml
index 1e87835ffb..5ebc2d0a0f 100644
--- a/edexOsgi/com.raytheon.edex.textdb/res/spring/textdb-request.xml
+++ b/edexOsgi/com.raytheon.edex.textdb/res/spring/textdb-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 		
 	<bean id="executeAfosCmdHandler" class="com.raytheon.edex.textdb.handler.ExecuteAfosCmdHandler" />
diff --git a/edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml b/edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
index 3ab5638f89..2639e15829 100644
--- a/edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
+++ b/edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
   <bean id="utilitySrv" class="com.raytheon.edex.services.UtilitySrv"/>
diff --git a/edexOsgi/com.raytheon.uf.common.dataaccess/res/spring/dataaccess-common.xml b/edexOsgi/com.raytheon.uf.common.dataaccess/res/spring/dataaccess-common.xml
index 1a7c87f3e0..8746cc7fe3 100644
--- a/edexOsgi/com.raytheon.uf.common.dataaccess/res/spring/dataaccess-common.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataaccess/res/spring/dataaccess-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"	
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean id="dataAccessRegistry" class="com.raytheon.uf.common.dataaccess.DataFactoryRegistry"
 			factory-method="getInstance" />	
diff --git a/edexOsgi/com.raytheon.uf.common.datadelivery.request/res/spring/datadelivery-common.xml b/edexOsgi/com.raytheon.uf.common.datadelivery.request/res/spring/datadelivery-common.xml
index 8f0c8c005a..60d7d72449 100644
--- a/edexOsgi/com.raytheon.uf.common.datadelivery.request/res/spring/datadelivery-common.xml
+++ b/edexOsgi/com.raytheon.uf.common.datadelivery.request/res/spring/datadelivery-common.xml
@@ -1,8 +1,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+  http://www.springframework.org/schema/util/spring-util-3.1.xsd">
 
     <util:constant id="dataDeliveryServerKey"
         static-field="com.raytheon.uf.common.datadelivery.request.DataDeliveryConstants.DATA_DELIVERY_SERVER" />
diff --git a/edexOsgi/com.raytheon.uf.common.datadelivery.service/res/spring/datadelivery-service.xml b/edexOsgi/com.raytheon.uf.common.datadelivery.service/res/spring/datadelivery-service.xml
index 18402b8277..02a0624419 100644
--- a/edexOsgi/com.raytheon.uf.common.datadelivery.service/res/spring/datadelivery-service.xml
+++ b/edexOsgi/com.raytheon.uf.common.datadelivery.service/res/spring/datadelivery-service.xml
@@ -1,8 +1,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+  http://www.springframework.org/schema/util/spring-util-3.1.xsd">
 
     <bean id="subscriptionNotificationService"
         class="com.raytheon.uf.common.datadelivery.service.SendToServerSubscriptionNotificationService" />
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/res/spring/ffmp-dataplugin-common.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/res/spring/ffmp-dataplugin-common.xml
index 9a2a2bcbad..6fd75ccb7b 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/res/spring/ffmp-dataplugin-common.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/res/spring/ffmp-dataplugin-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean id="ffmpDataFactory"
 		class="com.raytheon.uf.common.dataplugin.ffmp.dataaccess.FFMPGeometryFactory" />
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/res/spring/gfe-dataplugin-common.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/res/spring/gfe-dataplugin-common.xml
index 7b83cd2e22..d993d925e3 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/res/spring/gfe-dataplugin-common.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/res/spring/gfe-dataplugin-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"	
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean id="gfeGridFactory" class="com.raytheon.uf.common.dataplugin.gfe.dataaccess.GFEGridFactory" />
 	
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/res/spring/grid-dataplugin-common.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/res/spring/grid-dataplugin-common.xml
index d3cbdb8168..7c9fa60424 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/res/spring/grid-dataplugin-common.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/res/spring/grid-dataplugin-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"	
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean id="gridDataAccessFactory" class="com.raytheon.uf.common.dataplugin.grid.dataaccess.GridDataAccessFactory" />
 	
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.maps/res/spring/maps-dataplugin-common.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.maps/res/spring/maps-dataplugin-common.xml
index 58dd92c1ef..8cd2ed376b 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.maps/res/spring/maps-dataplugin-common.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.maps/res/spring/maps-dataplugin-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"	
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean id="mapsPluginName" class="java.lang.String">
 		<constructor-arg type="java.lang.String" value="maps" />
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/res/spring/radar-dataplugin-common.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/res/spring/radar-dataplugin-common.xml
index 89827cc6a2..f63e8ab5c2 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/res/spring/radar-dataplugin-common.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/res/spring/radar-dataplugin-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"	
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean id="radarUnitsRegisterd"
 		class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/res/spring/satellite-dataplugin-common.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/res/spring/satellite-dataplugin-common.xml
index 826f62fb72..f7749bd7ec 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/res/spring/satellite-dataplugin-common.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/res/spring/satellite-dataplugin-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"	
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean id="satellitePluginName" class="java.lang.String">
 		<constructor-arg type="java.lang.String" value="satellite" />
diff --git a/edexOsgi/com.raytheon.uf.common.event/res/spring/eventbus-common.xml b/edexOsgi/com.raytheon.uf.common.event/res/spring/eventbus-common.xml
index d91c81f60d..29fccf6974 100644
--- a/edexOsgi/com.raytheon.uf.common.event/res/spring/eventbus-common.xml
+++ b/edexOsgi/com.raytheon.uf.common.event/res/spring/eventbus-common.xml
@@ -1,7 +1,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans
-  http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+  http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
     <bean id="eventBus" class="com.raytheon.uf.common.event.EventBusBean" />
 
diff --git a/edexOsgi/com.raytheon.uf.common.geospatial/res/spring/geo-common.xml b/edexOsgi/com.raytheon.uf.common.geospatial/res/spring/geo-common.xml
index d720e0b4e1..c084427892 100644
--- a/edexOsgi/com.raytheon.uf.common.geospatial/res/spring/geo-common.xml
+++ b/edexOsgi/com.raytheon.uf.common.geospatial/res/spring/geo-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean class="com.raytheon.uf.common.util.ConvertUtil" factory-method="registerConverter">
   		<constructor-arg><bean class="com.raytheon.uf.common.geospatial.util.JtsGeometryConverter"/></constructor-arg>
diff --git a/edexOsgi/com.raytheon.uf.common.gridcoverage/res/spring/gridcoverage-converter-common.xml b/edexOsgi/com.raytheon.uf.common.gridcoverage/res/spring/gridcoverage-converter-common.xml
index a228be39bf..30dfee0239 100644
--- a/edexOsgi/com.raytheon.uf.common.gridcoverage/res/spring/gridcoverage-converter-common.xml
+++ b/edexOsgi/com.raytheon.uf.common.gridcoverage/res/spring/gridcoverage-converter-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean class="com.raytheon.uf.common.util.ConvertUtil" factory-method="registerConverter">
   		<constructor-arg><bean class="com.raytheon.uf.common.gridcoverage.convert.GridCoverageConverter"/></constructor-arg>
diff --git a/edexOsgi/com.raytheon.uf.common.hydro/res/spring/hydro-common.xml b/edexOsgi/com.raytheon.uf.common.hydro/res/spring/hydro-common.xml
index c58cd039bf..2732f807dc 100644
--- a/edexOsgi/com.raytheon.uf.common.hydro/res/spring/hydro-common.xml
+++ b/edexOsgi/com.raytheon.uf.common.hydro/res/spring/hydro-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"	
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean id="hydroDataFactory" class="com.raytheon.uf.common.hydro.dataaccess.HydroGeometryFactory" />
 	
diff --git a/edexOsgi/com.raytheon.uf.common.registry.ebxml/res/spring/ebxml-registry-common.xml b/edexOsgi/com.raytheon.uf.common.registry.ebxml/res/spring/ebxml-registry-common.xml
index 284fcaa7b7..5b79a556c0 100644
--- a/edexOsgi/com.raytheon.uf.common.registry.ebxml/res/spring/ebxml-registry-common.xml
+++ b/edexOsgi/com.raytheon.uf.common.registry.ebxml/res/spring/ebxml-registry-common.xml
@@ -1,10 +1,10 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
   http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+  http://www.springframework.org/schema/util/spring-util-3.1.xsd">
 
     <util:constant id="ebxmlRegistryServiceKey"
         static-field="com.raytheon.uf.common.registry.RegistryConstants.EBXML_REGISTRY_SERVICE" />
diff --git a/edexOsgi/com.raytheon.uf.common.time/res/spring/time-common.xml b/edexOsgi/com.raytheon.uf.common.time/res/spring/time-common.xml
index 061cb94a31..04f261cf5b 100644
--- a/edexOsgi/com.raytheon.uf.common.time/res/spring/time-common.xml
+++ b/edexOsgi/com.raytheon.uf.common.time/res/spring/time-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean id="dataTimeConverterRegistered" class="com.raytheon.uf.common.util.ConvertUtil" factory-method="registerConverter">
   		<constructor-arg><bean class="com.raytheon.uf.common.time.util.DataTimeConverter"/></constructor-arg>
diff --git a/edexOsgi/com.raytheon.uf.common.units/res/spring/units-common.xml b/edexOsgi/com.raytheon.uf.common.units/res/spring/units-common.xml
index f34aad4525..4a6d130f1c 100644
--- a/edexOsgi/com.raytheon.uf.common.units/res/spring/units-common.xml
+++ b/edexOsgi/com.raytheon.uf.common.units/res/spring/units-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean class="com.raytheon.uf.common.util.ConvertUtil" factory-method="registerConverter">
   		<constructor-arg><bean class="com.raytheon.uf.common.units.UnitConverter"/></constructor-arg>
diff --git a/edexOsgi/com.raytheon.uf.common.useradmin/res/spring/useradmin-common.xml b/edexOsgi/com.raytheon.uf.common.useradmin/res/spring/useradmin-common.xml
index 74a107766a..b17c8cceea 100644
--- a/edexOsgi/com.raytheon.uf.common.useradmin/res/spring/useradmin-common.xml
+++ b/edexOsgi/com.raytheon.uf.common.useradmin/res/spring/useradmin-common.xml
@@ -1,8 +1,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+  http://www.springframework.org/schema/util/spring-util-3.1.xsd">
 
     <util:constant id="userAuthenticationChangedTopic"
         static-field="com.raytheon.uf.common.useradmin.request.UserAdminConstants.USER_AUTHENTICATION_CHANGED_TOPIC" />
diff --git a/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-common.xml b/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-common.xml
index 1f152dfcc8..90d3b14908 100644
--- a/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="vtecFilter" class="com.raytheon.edex.plugin.warning.util.WarningHasVTECFilter" />
diff --git a/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml b/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
index 9bca2dfb8f..325c974b1a 100644
--- a/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
@@ -2,9 +2,9 @@
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:context="http://www.springframework.org/schema/context"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
 	<camelContext id="clusteredActiveTableContext"
 		xmlns="http://camel.apache.org/schema/spring"
 		errorHandlerRef="errorHandler"
diff --git a/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-request.xml b/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-request.xml
index f293a47ca0..303fb4da44 100644
--- a/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="getActiveTableHandler" class="com.raytheon.uf.edex.activetable.GetActiveTableHandler"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.alertviz/res/spring/alertviz-request.xml b/edexOsgi/com.raytheon.uf.edex.alertviz/res/spring/alertviz-request.xml
index 02e75ffdaf..b2905563c5 100644
--- a/edexOsgi/com.raytheon.uf.edex.alertviz/res/spring/alertviz-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.alertviz/res/spring/alertviz-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
   	<!-- Instantiate the handler class for AlertVizRequest Handler -->
diff --git a/edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-common.xml b/edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-common.xml
index c1977792d3..ba572f0f4d 100644
--- a/edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="serializeServer" class="com.raytheon.uf.edex.auth.RemoteRequestServer"
diff --git a/edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-request.xml b/edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-request.xml
index 02938261ee..c2cbc348c6 100644
--- a/edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
             
     <bean id="binaryHttpBinding" class="com.raytheon.uf.edex.esb.camel.http.BinaryHttpBinding"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.awipstools/res/spring/awipstools-request.xml b/edexOsgi/com.raytheon.uf.edex.awipstools/res/spring/awipstools-request.xml
index 3964408c6b..e997f268eb 100644
--- a/edexOsgi/com.raytheon.uf.edex.awipstools/res/spring/awipstools-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.awipstools/res/spring/awipstools-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
   	<bean id="getWfoCenter" class="com.raytheon.uf.edex.awipstools.GetWfoCenterHandler"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.core/res/spring/edex-request.xml b/edexOsgi/com.raytheon.uf.edex.core/res/spring/edex-request.xml
index 59c48d2115..770c988bbf 100644
--- a/edexOsgi/com.raytheon.uf.edex.core/res/spring/edex-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.core/res/spring/edex-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="getPluginRecordMapHandler"
diff --git a/edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml b/edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
index 77a8fb72b3..3645c931bc 100644
--- a/edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="cpgSrvDispatcher" class="com.raytheon.uf.edex.cpgsrv.CPGDispatcher" depends-on="commonTimeRegistered"/>
 	
diff --git a/edexOsgi/com.raytheon.uf.edex.dat.utils/res/spring/dat-request.xml b/edexOsgi/com.raytheon.uf.edex.dat.utils/res/spring/dat-request.xml
index b048fb46c2..d93c5fe599 100644
--- a/edexOsgi/com.raytheon.uf.edex.dat.utils/res/spring/dat-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.dat.utils/res/spring/dat-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   	
   	<bean id="datMenuUtil" class="com.raytheon.uf.edex.dat.utils.DatMenuUtil" />
diff --git a/edexOsgi/com.raytheon.uf.edex.database/res/spring/database-common.xml b/edexOsgi/com.raytheon.uf.edex.database/res/spring/database-common.xml
index 4bd4914ef4..241de918ac 100644
--- a/edexOsgi/com.raytheon.uf.edex.database/res/spring/database-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.database/res/spring/database-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
   <bean id="queryData" class="com.raytheon.uf.edex.database.handlers.DbQueryHandler"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-daos.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-daos.xml
index f6a1106276..f93d42e705 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-daos.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-daos.xml
@@ -1,7 +1,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:util="http://www.springframework.org/schema/util" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-    http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+    http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd">
 
     <bean id="bandwidthAllocationDao"
         class="com.raytheon.uf.edex.datadelivery.bandwidth.hibernate.BandwidthAllocationDao">
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
index 30a0f86cbe..cea335206d 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
@@ -1,10 +1,10 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:util="http://www.springframework.org/schema/util" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:tx="http://www.springframework.org/schema/tx"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
       http://www.springframework.org/schema/tx
   http://www.springframework.org/schema/tx/spring-tx.xsd
-    http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
+    http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <tx:annotation-driven transaction-manager="metadataTxManager"
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-eventbus.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-eventbus.xml
index 56bbf91977..c22e810348 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-eventbus.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-eventbus.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
     <bean factory-bean="eventBus" factory-method="register">
         <constructor-arg ref="retrievalManager" />
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-inmemory-impl.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-inmemory-impl.xml
index d3a4e0c58b..840c01e4e5 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-inmemory-impl.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-inmemory-impl.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
     <!-- Separated from the other beans because we want to be able to use 
         any DAO implementation along with the other Spring files (e.g. in-memory 
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo-edex-impl.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo-edex-impl.xml
index bca6ad6730..d6f48cd905 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo-edex-impl.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo-edex-impl.xml
@@ -1,7 +1,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:util="http://www.springframework.org/schema/util" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-    http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+    http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd">
 
     <bean id="bandwidthManagerCreator"
         class="com.raytheon.uf.edex.datadelivery.bandwidth.WfoBandwidthManagerCreator" />
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo-router.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo-router.xml
index dbdc26c66b..4dd231972d 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo-router.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo-router.xml
@@ -1,7 +1,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:util="http://www.springframework.org/schema/util" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-    http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+    http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd">
 
     <bean id="ncfBandwidthManagerServiceRouter" class="com.raytheon.uf.edex.auth.RemoteServerRequestRouter">
         <constructor-arg value="${NCF_BANDWIDTH_MANAGER_SERVICE}" />
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo.xml
index 380cffdd33..c2db44f52c 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo.xml
@@ -1,7 +1,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:util="http://www.springframework.org/schema/util" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-    http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+    http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd">
 
     <util:list id="subscriptionRoutesToSchedule">
         <value>OPSNET</value>
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery.xml
index beb2a35cc9..2a2dbc45c4 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean id="propertyPlaceholderConfigurer"
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-graph-datadelivery.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-graph-datadelivery.xml
index 49e6670b67..cb1ccec108 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-graph-datadelivery.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-graph-datadelivery.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
     <bean id="bandwidthService"
         class="com.raytheon.uf.common.datadelivery.bandwidth.WfoBandwidthService" />
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/thrift-bandwidth.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/thrift-bandwidth.xml
index d2aa4c70b0..286d6764dc 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/thrift-bandwidth.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/thrift-bandwidth.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
     <bean id="bandwidthHandlerRegistry" class="com.raytheon.uf.edex.auth.HandlerRegistry"
         factory-method="getInstance" />
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery-common.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery-common.xml
index 1645c7dd62..5e0ee39573 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   	       
    	<bean id="ddEventDatabaseProperties" class="com.raytheon.uf.edex.database.DatabasePluginProperties">
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery-ingest.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery-ingest.xml
index d7bdf4e6e8..12596450aa 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="notificationHandler"
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery.xml
index 52b587ac27..0c02881263 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="getNotificationHandler"
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/crawler-datadelivery.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/crawler-datadelivery.xml
index c7d01b9172..85953d3952 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/crawler-datadelivery.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/crawler-datadelivery.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <!--  These beans have internal cron triggering now, read directly from the harvester config files -->
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/dpa-datadelivery.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/dpa-datadelivery.xml
index d17cd72b92..e790e4bd94 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/dpa-datadelivery.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/dpa-datadelivery.xml
@@ -1,8 +1,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+  http://www.springframework.org/schema/util/spring-util-3.1.xsd">
 
     <util:constant id="dataDeliveryServerKey"
         static-field="com.raytheon.uf.common.datadelivery.request.DataDeliveryConstants.DATA_DELIVERY_SERVER" />
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery-registry.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery-registry.xml
index 4aea1611f9..a59773a5ce 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery-registry.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery-registry.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <!-- Empty bean that is used to depend on registry initialization. Any 
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery-standalone.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery-standalone.xml
index 57a7e5f72f..057e3ebbc5 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery-standalone.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery-standalone.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <!-- Empty bean that is used to depend on registry initialization. Any 
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
index 907a08363e..4cbe9a6857 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"    
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="jmsIngestHarvesterConfig" class="org.apache.camel.component.jms.JmsConfiguration"
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/ogc-purge.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/ogc-purge.xml
index 58a37ee03b..ca4373358e 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/ogc-purge.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/ogc-purge.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean id="purgeManager" class="com.raytheon.uf.edex.datadelivery.harvester.purge.OGCPurgeManager">
 		<property name="clusterLimit" value="${purge.clusterlimit}"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.request/res/spring/datadelivery-router.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.request/res/spring/datadelivery-router.xml
index 1e13f9ad3f..94eb050724 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.request/res/spring/datadelivery-router.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.request/res/spring/datadelivery-router.xml
@@ -1,10 +1,10 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
   http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+  http://www.springframework.org/schema/util/spring-util-3.1.xsd">
     
     <bean id="dataDeliveryRequestRouter"
         class="com.raytheon.uf.edex.auth.ServerRequestRouter" />
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.request/res/spring/request-router.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.request/res/spring/request-router.xml
index a18cb01326..cb170fe5b4 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.request/res/spring/request-router.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.request/res/spring/request-router.xml
@@ -1,10 +1,10 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
   http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+  http://www.springframework.org/schema/util/spring-util-3.1.xsd">
 
     <bean id="requestDataDeliveryRouter" class="com.raytheon.uf.edex.auth.RemoteServerRequestRouter">
         <constructor-arg value="${DATADELIVERY_SERVER}" />
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery-daos.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery-daos.xml
index b12b628828..566f396b3a 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery-daos.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery-daos.xml
@@ -1,7 +1,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+  http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="retrievalTransactionInterceptor"
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery-ncf.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery-ncf.xml
index 85f95c7690..7e42ffaa5d 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery-ncf.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery-ncf.xml
@@ -1,7 +1,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+  http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd">
 
     <!-- A RetrievalTask takes three constructor arguments:
         1) How to find retrievals, in this case perform the actual retrieval and return it
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery-wfo.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery-wfo.xml
index ec88cb9356..6937481def 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery-wfo.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery-wfo.xml
@@ -1,7 +1,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+  http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd">
 
     <!-- A RetrievalTask takes three constructor arguments:
         1) How to find retrievals, in this case perform the actual retrieval and return it
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery.xml
index ba54bb25b6..cd0b177b13 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery.xml
@@ -1,7 +1,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+  http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="ddRetrievalDatabaseProperties"
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-handlers-impl.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-handlers-impl.xml
index f0d81beb1b..5bd696f51e 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-handlers-impl.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-handlers-impl.xml
@@ -1,8 +1,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
 
     <!-- Moved in to an EDEX specific file so that the registration of handlers 
         Spring file can be reused for automated testing -->
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-handlers.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-handlers.xml
index c3cd9beb6e..8e2c650734 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-handlers.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-handlers.xml
@@ -1,8 +1,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
   
     <bean id="registryObjectHandlerRegistry" class="com.raytheon.uf.common.registry.handler.RegistryObjectHandlers" factory-method="getInstance"/>
     
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-service-handlers.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-service-handlers.xml
index 3cd1b2f13d..f6e824b2a1 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-service-handlers.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-service-handlers.xml
@@ -1,8 +1,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+  http://www.springframework.org/schema/util/spring-util-3.1.xsd">
 
     <bean id="datadeliveryAuthorization"
         class="com.raytheon.uf.edex.datadelivery.service.services.DataDeliveryPrivilegedRequestHandler" />
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-standalone.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-standalone.xml
index 6a13e7e9f5..2ee79f5827 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-standalone.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-standalone.xml
@@ -1,8 +1,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+  http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
 
     <bean id="registryHandler"
         class="com.raytheon.uf.common.registry.ebxml.ThriftRegistryHandler" />
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-subscription-verification.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-subscription-verification.xml
index c8850888b6..c29b5364e5 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-subscription-verification.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-subscription-verification.xml
@@ -1,10 +1,10 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
   http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+  http://www.springframework.org/schema/util/spring-util-3.1.xsd">
 
     <bean id="verificationStrategy"
         class="com.raytheon.uf.edex.datadelivery.service.verify.BaseSubscriptionVerifier" />
diff --git a/edexOsgi/com.raytheon.uf.edex.dissemination/res/spring/dissemination-request.xml b/edexOsgi/com.raytheon.uf.edex.dissemination/res/spring/dissemination-request.xml
index 563ccbff9e..f6e61f7355 100644
--- a/edexOsgi/com.raytheon.uf.edex.dissemination/res/spring/dissemination-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.dissemination/res/spring/dissemination-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="oupAckMgr" class="com.raytheon.uf.edex.dissemination.OUPAckManager" />
diff --git a/edexOsgi/com.raytheon.uf.edex.distribution/res/spring/distribution-spring.xml b/edexOsgi/com.raytheon.uf.edex.distribution/res/spring/distribution-spring.xml
index 08bba15f5c..f9e9cfdb41 100644
--- a/edexOsgi/com.raytheon.uf.edex.distribution/res/spring/distribution-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.distribution/res/spring/distribution-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
   	<bean id="distributionSrv" class="com.raytheon.uf.edex.distribution.DistributionSrv" />
diff --git a/edexOsgi/com.raytheon.uf.edex.event/res/spring/event-common.xml b/edexOsgi/com.raytheon.uf.edex.event/res/spring/event-common.xml
index f829353e57..3af049d6d4 100644
--- a/edexOsgi/com.raytheon.uf.edex.event/res/spring/event-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.event/res/spring/event-common.xml
@@ -1,7 +1,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-  http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="logHandler" class="com.raytheon.uf.edex.event.handler.LogHandler" />
     
diff --git a/edexOsgi/com.raytheon.uf.edex.event/res/spring/event-ingest.xml b/edexOsgi/com.raytheon.uf.edex.event/res/spring/event-ingest.xml
index 851cc8cf5a..8fad78621e 100644
--- a/edexOsgi/com.raytheon.uf.edex.event/res/spring/event-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.event/res/spring/event-ingest.xml
@@ -2,7 +2,7 @@
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans
-  http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    	<bean id="jms-notify" class="org.apache.camel.component.jms.JmsComponent">
diff --git a/edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml b/edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
index 009f7f5b6b..3921b96e25 100644
--- a/edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
+++ b/edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="staticDataGenerator"
diff --git a/edexOsgi/com.raytheon.uf.edex.gridcoverage/res/spring/gridcoverage-common.xml b/edexOsgi/com.raytheon.uf.edex.gridcoverage/res/spring/gridcoverage-common.xml
index c2787c6a21..7b836b3ba8 100644
--- a/edexOsgi/com.raytheon.uf.edex.gridcoverage/res/spring/gridcoverage-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.gridcoverage/res/spring/gridcoverage-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="getGridCoverageHandler"
diff --git a/edexOsgi/com.raytheon.uf.edex.maintenance/res/spring/maintenance-ingest.xml b/edexOsgi/com.raytheon.uf.edex.maintenance/res/spring/maintenance-ingest.xml
index 3bf96080b0..d39172ac5a 100644
--- a/edexOsgi/com.raytheon.uf.edex.maintenance/res/spring/maintenance-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.maintenance/res/spring/maintenance-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
     
 	<bean id="dataStoreRepacker" class="com.raytheon.uf.edex.maintenance.DataStoreRepacker">
diff --git a/edexOsgi/com.raytheon.uf.edex.management/res/spring/management-common.xml b/edexOsgi/com.raytheon.uf.edex.management/res/spring/management-common.xml
index beac1c5238..657ffa30af 100644
--- a/edexOsgi/com.raytheon.uf.edex.management/res/spring/management-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.management/res/spring/management-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
     <bean id="mgmtInit" class="com.raytheon.uf.edex.management.MgmtInitializer" />
diff --git a/edexOsgi/com.raytheon.uf.edex.management/res/spring/management-request.xml b/edexOsgi/com.raytheon.uf.edex.management/res/spring/management-request.xml
index 7f28f86422..fb4201da13 100644
--- a/edexOsgi/com.raytheon.uf.edex.management/res/spring/management-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.management/res/spring/management-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
     <bean id="passThroughHandler"
diff --git a/edexOsgi/com.raytheon.uf.edex.menus/res/spring/menus-request.xml b/edexOsgi/com.raytheon.uf.edex.menus/res/spring/menus-request.xml
index 57c002a3af..3c437cd7e8 100644
--- a/edexOsgi/com.raytheon.uf.edex.menus/res/spring/menus-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.menus/res/spring/menus-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   	
   	<bean id="menuCreationRegistry" class="com.raytheon.uf.edex.menus.MenuCreationRegistry" factory-method="getInstance" />
diff --git a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/res/spring/metartohmdb-plugin.xml b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/res/spring/metartohmdb-plugin.xml
index fc29821f7e..69821ef428 100644
--- a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/res/spring/metartohmdb-plugin.xml
+++ b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/res/spring/metartohmdb-plugin.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="metarToHMDB" class="com.raytheon.uf.edex.metartohmdb.MetarToHMDBSrv" />
diff --git a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/res/spring/metartohmdb-spring.xml b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/res/spring/metartohmdb-spring.xml
index ea5ee261ee..1d2bdc5c06 100644
--- a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/res/spring/metartohmdb-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/res/spring/metartohmdb-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="metarToHMDBPurger" class="com.raytheon.uf.edex.metartohmdb.HMDBPurger">
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/DPADecoder-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/DPADecoder-spring.xml
index 0d7b151570..56f39429d5 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/DPADecoder-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/DPADecoder-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="radarDecompressor" class="com.raytheon.edex.plugin.radar.RadarDecompressor"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/alarmWhfs-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/alarmWhfs-spring.xml
index 3b082f9fdf..3262562070 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/alarmWhfs-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/alarmWhfs-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="alarmSrv" class="com.raytheon.uf.edex.ohd.whfs.WhfsSrv">
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/arealQpeGen-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/arealQpeGen-spring.xml
index 6a95b37f6f..7e4488bd88 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/arealQpeGen-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/arealQpeGen-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
  <bean id="qpeGenService" class="com.raytheon.uf.edex.ohd.pproc.ArealQpeGenSrv">
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/arealffgGenerator-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/arealffgGenerator-spring.xml
index 0fbea520d5..d3d4ac44bb 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/arealffgGenerator-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/arealffgGenerator-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 <!-- data only comes in netcdf from RFC, disabling for now
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/dqcPreprocessor-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/dqcPreprocessor-spring.xml
index 7c7d3bb1a9..c7cf5a9dcf 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/dqcPreprocessor-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/dqcPreprocessor-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/floodArchiver-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/floodArchiver-spring.xml
index e53c1296c9..69225b12a4 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/floodArchiver-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/floodArchiver-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="floodseqSrv" class="com.raytheon.uf.edex.ohd.whfs.WhfsSrv">
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/freezingLevel-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/freezingLevel-spring.xml
index 8f75025bcb..b8273e60ac 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/freezingLevel-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/freezingLevel-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/hpeDHRDecoder-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/hpeDHRDecoder-spring.xml
index a47f26eb09..5a1903b055 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/hpeDHRDecoder-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/hpeDHRDecoder-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="radarDecompressor" class="com.raytheon.edex.plugin.radar.RadarDecompressor"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ihfsDbPurge-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ihfsDbPurge-spring.xml
index a3b4b41ec7..7788c629f6 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ihfsDbPurge-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ihfsDbPurge-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ihfsDbPurge" class="com.raytheon.uf.edex.ohd.whfs.WhfsSrv">
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/logFilePurger-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/logFilePurger-spring.xml
index 1b08c3423a..e277601c45 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/logFilePurger-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/logFilePurger-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="logFilePurger" class="com.raytheon.uf.edex.ohd.whfs.WhfsSrv">
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeFieldgen-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeFieldgen-spring.xml
index 33dfe17149..7bb5cd95dc 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeFieldgen-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeFieldgen-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeHpeFilePurge-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeHpeFilePurge-spring.xml
index 15c2dcdd3f..45d278e8b1 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeHpeFilePurge-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeHpeFilePurge-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="mpeHpeFilePurger" class="com.raytheon.uf.edex.ohd.pproc.PprocSrv">
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeLightningSrv-ingest.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeLightningSrv-ingest.xml
index ef7b9193c7..2305af6fab 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeLightningSrv-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeLightningSrv-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
         <bean id="mpeLightSrv" class="com.raytheon.uf.edex.ohd.pproc.MpeLightningSrv" />
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeProcessGrib-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeProcessGrib-spring.xml
index a0aa8fbc3b..0b1c7c282a 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeProcessGrib-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeProcessGrib-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 </beans>
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
index 8fd79fea97..312bbfe286 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
   	<!--  IHFS Database Configuration-->
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-request.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-request.xml
index c5079dc65c..b49bd0c742 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
   <bean id="retrieveWhfsServiceData" class="com.raytheon.uf.edex.ohd.whfs.WhfsServiceHandler"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohdSetupService-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohdSetupService-spring.xml
index a7c0f9b1be..e240d32542 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohdSetupService-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohdSetupService-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ohdSetupService" class="com.raytheon.uf.edex.ohd.SetupSrv">
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/pointDataRetrievel-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/pointDataRetrievel-spring.xml
index 1416f7681b..2a4b41acf7 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/pointDataRetrievel-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/pointDataRetrievel-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="pdcSrv" class="com.raytheon.uf.edex.ohd.whfs.WhfsSrv">
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/q2FileProcessor-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/q2FileProcessor-spring.xml
index 889f0c264c..0892b6c6e2 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/q2FileProcessor-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/q2FileProcessor-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="q2Proc" class="com.raytheon.uf.edex.ohd.pproc.Q2FileUnzip"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
index 9fd114c49f..f68af90cc2 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="satPreFilter" class="com.raytheon.uf.edex.ohd.pproc.SatPreURIFilter">
diff --git a/edexOsgi/com.raytheon.uf.edex.parameter/res/spring/parameter-common.xml b/edexOsgi/com.raytheon.uf.edex.parameter/res/spring/parameter-common.xml
index 7c23d45ed6..ee699190cb 100644
--- a/edexOsgi/com.raytheon.uf.edex.parameter/res/spring/parameter-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.parameter/res/spring/parameter-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd    
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd    
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="getParameterHandler"
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/spring/acars-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/spring/acars-common.xml
index 12c6c47188..4d1e23a7ec 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/spring/acars-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/spring/acars-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="acarsPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/spring/acars-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/spring/acars-ingest.xml
index aaba1ec034..866ff93d3f 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/spring/acars-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/spring/acars-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="acarsDecoder" class="com.raytheon.uf.edex.plugin.acars.ACARSDecoder"  depends-on="acarsPluginName" >
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/res/spring/acarssounding-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/res/spring/acarssounding-common.xml
index b3931af549..1e18df2fbb 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/res/spring/acarssounding-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/res/spring/acarssounding-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="acarsSoundingPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/res/spring/acarssounding-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/res/spring/acarssounding-ingest.xml
index 1ff389022f..8ea912c28d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/res/spring/acarssounding-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/res/spring/acarssounding-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="acarsAirports" class="com.raytheon.uf.common.dataplugin.acarssounding.tools.AirportsBean" depends-on="acarsSoundingPluginName" >
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/spring/bufrascat-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/spring/bufrascat-common.xml
index 96e07ce73c..2acc09a017 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/spring/bufrascat-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/spring/bufrascat-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="bufrascatPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/spring/bufrascat-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/spring/bufrascat-ingest.xml
index 634b6d33e4..e64ab807b9 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/spring/bufrascat-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/spring/bufrascat-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="bufrascatDecoder" class="com.raytheon.uf.edex.plugin.bufrascat.AScatDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-common.xml
index 69d8af8e55..af49abc8f6 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="bufrhdwPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-ingest.xml
index 3e5c0ab4ea..699cf61c43 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="bufrhdwDecoder" class="com.raytheon.uf.edex.plugin.bufrhdw.HDWDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-common.xml
index ddc19e8b89..c625dc8d8f 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="bufrmthdwPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-ingest.xml
index a7ba6780e8..5355363b11 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="bufrmthdwDecoder" class="com.raytheon.uf.edex.plugin.bufrmthdw.MTHDWDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-common.xml
index 6f6a8562a3..9f163b188c 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="bufrncwfPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-ingest.xml
index 7a5128a282..15312750ac 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="bufrncwfDecoder" class="com.raytheon.uf.edex.plugin.bufrncwf.BUFRncwfDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-common.xml
index 3b571b98d6..696bb8de05 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="bufrquikscatPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-ingest.xml
index a79fd8088e..561fd75964 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="bufrquikscatDecoder" class="com.raytheon.uf.edex.plugin.bufrquikscat.QUIKScatDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-common.xml
index 8356f20fc9..fd29024a90 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="bufrsigwxPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-ingest.xml
index 078912fc2e..88c446588d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-common.xml
index 46611903fd..4baf721919 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="bufrssmiPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-ingest.xml
index c439d732fe..e6189f6dc6 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="bufrssmiDecoder" class="com.raytheon.uf.edex.plugin.bufrssmi.SSMIDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-common.xml
index 416eefaeb7..09b24c8478 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="cwaPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-ingest.xml
index 35c155a443..4c7bfef45e 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="cwaDecoder" class="com.raytheon.uf.edex.plugin.cwa.CWADecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-common.xml
index cf3d39bd87..16fa2a7525 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="cwatPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-ingest.xml
index 64f11f19f6..ae9b65188f 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="cwatGenerator" class="com.raytheon.uf.edex.plugin.cwat.CWATGenerator"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-common.xml
index ec351af533..4a605b0c22 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	
 	<bean id="ffmpPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-ingest.xml
index 9672100f39..5ca2246ce6 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ffmpThreadPool"
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-common.xml
index 407b953d1b..58e1c7faa1 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="fogPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-ingest.xml
index 5583a463ea..443d8aefef 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="fogGenerator" class="com.raytheon.uf.edex.plugin.fog.FogGenerator"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/res/spring/fssobs-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/res/spring/fssobs-common.xml
index fd32b9aacb..e4c06d7d89 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/res/spring/fssobs-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/res/spring/fssobs-common.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="fssObsPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/res/spring/fssobs-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/res/spring/fssobs-ingest.xml
index c2dc5f297b..81d2128404 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/res/spring/fssobs-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/res/spring/fssobs-ingest.xml
@@ -2,7 +2,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="fssObsPointData" class="com.raytheon.uf.edex.plugin.fssobs.FSSObsDataTransform"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/res/spring/grid-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/res/spring/grid-common.xml
index ad337089a3..bed96d2382 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/res/spring/grid-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/res/spring/grid-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="gridPathProvider" class="com.raytheon.uf.common.dataplugin.grid.GridPathProvider" />
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/res/spring/grid-request.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/res/spring/grid-request.xml
index 9236e4b482..e3b642b9a3 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/res/spring/grid-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/res/spring/grid-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="gridTreeHandler"
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/res/spring/ldadmesonet-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/res/spring/ldadmesonet-common.xml
index e879a200fc..cbac5f21fe 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/res/spring/ldadmesonet-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/res/spring/ldadmesonet-common.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="mesonetPluginName" class="java.lang.String">
 		<constructor-arg type="java.lang.String" value="ldadmesonet" />
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/res/spring/ldadmesonet-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/res/spring/ldadmesonet-ingest.xml
index 7cac22fd93..75af09bbdc 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/res/spring/ldadmesonet-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/res/spring/ldadmesonet-ingest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">	
 	
 	<bean id="mesonetDecoder" class="com.raytheon.uf.edex.plugin.ldadmesonet.MesonetDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.level.handler/res/spring/levelhandler-request.xml b/edexOsgi/com.raytheon.uf.edex.plugin.level.handler/res/spring/levelhandler-request.xml
index 99db7c4eb1..c05829d1fd 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.level.handler/res/spring/levelhandler-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.level.handler/res/spring/levelhandler-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="getMasterLevelHandler" class="com.raytheon.uf.edex.plugin.level.handler.GetMasterLevelHandler" />
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.level/res/spring/level-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.level/res/spring/level-common.xml
index 16349188db..6f550af931 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.level/res/spring/level-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.level/res/spring/level-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="levelProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.loctables/res/spring/loctables-spring.xml b/edexOsgi/com.raytheon.uf.edex.plugin.loctables/res/spring/loctables-spring.xml
index 17ebddee92..73411fa42e 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.loctables/res/spring/loctables-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.loctables/res/spring/loctables-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="loctablesPluginName" class="java.lang.String" depends-on="ndmProc">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-common.xml
index 839b0eeb5f..8b6825d04c 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="lclstrmrptPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-ingest.xml
index 54543814ec..81ebd8de6e 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="lclstrmrptDecoder" class="com.raytheon.uf.edex.plugin.lsr.LSRDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-common.xml
index 41a4c63fd4..6f7548db53 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="manualProc" class="com.raytheon.uf.edex.plugin.manualIngest.MessageGenerator" factory-method="getInstance">
 	   <property name="ingestRoute" value="manualFilePush"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-request.xml b/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-request.xml
index 7f1e577db4..a3f70e50f0 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<camelContext id="manualFilePushContext"
 		xmlns="http://camel.apache.org/schema/spring"
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml b/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
index 9a5ad1baab..7c5c1010eb 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="fileChangedStrategy" class="com.raytheon.uf.edex.esb.camel.FileChangedExclusiveReadLockStrategy"/>
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/res/spring/mesowest-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/res/spring/mesowest-common.xml
index 50c1530507..410e192af4 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/res/spring/mesowest-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/res/spring/mesowest-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="mesowestPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/res/spring/mesowest-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/res/spring/mesowest-ingest.xml
index efb2fc520b..fdb06cc522 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/res/spring/mesowest-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/res/spring/mesowest-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="mesowestDatabase" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.crimss/res/spring/crimss-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.crimss/res/spring/crimss-common.xml
index fa7f759aa4..7c85a76e60 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.crimss/res/spring/crimss-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.crimss/res/spring/crimss-common.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="crimssPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.crimss/res/spring/crimss-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.crimss/res/spring/crimss-ingest.xml
index d3c99a79bf..2192e3752e 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.crimss/res/spring/crimss-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.crimss/res/spring/crimss-ingest.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="crimssDecoder" class="com.raytheon.uf.edex.plugin.npp.sounding.NPPSoundingDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/res/spring/nucaps-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/res/spring/nucaps-common.xml
index 852b796f1c..2515642916 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/res/spring/nucaps-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/res/spring/nucaps-common.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="nucapsPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/res/spring/nucaps-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/res/spring/nucaps-ingest.xml
index c2ba107a5a..52c677b9e2 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/res/spring/nucaps-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/res/spring/nucaps-ingest.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="nucapsDecoder" class="com.raytheon.uf.edex.plugin.npp.sounding.NPPSoundingDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/res/spring/viirs-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/res/spring/viirs-common.xml
index c4ed16f071..6b7fda2a70 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/res/spring/viirs-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/res/spring/viirs-common.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="viirsPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/res/spring/viirs-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/res/spring/viirs-ingest.xml
index c8434e2226..5c789e19a8 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/res/spring/viirs-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/res/spring/viirs-ingest.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="viirsThreadPool"
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/res/spring/nwsauth-request.xml b/edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/res/spring/nwsauth-request.xml
index d467715147..5d9a0c0591 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/res/spring/nwsauth-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/res/spring/nwsauth-request.xml
@@ -1,8 +1,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+  http://www.springframework.org/schema/util/spring-util-3.1.xsd">
 
     <bean id="roleStorage" class="com.raytheon.uf.edex.plugin.nwsauth.NwsRoleStorage" />
     <bean id="authenticator"
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-common.xml
index 73fa35aa66..cad5173263 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="precipratePluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-ingest.xml
index 3daf5d61eb..d374d0f528 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="preciprateGenerator" class="com.raytheon.uf.edex.plugin.preciprate.PrecipRateGenerator"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/spring/qc-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/spring/qc-common.xml
index f1a9e6a6dc..ac59e508d3 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/spring/qc-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/spring/qc-common.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="qcProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/spring/qc-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/spring/qc-ingest.xml
index 4e4f2350f4..a51ae7cde2 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/spring/qc-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/spring/qc-ingest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="qcScanner" class="com.raytheon.uf.edex.plugin.qc.QCScanner" depends-on="qcProperties">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-common.xml
index caecbac1ec..8a6db789d8 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="qpfPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-ingest.xml
index 634cc59b14..dae101b2b6 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="qpfGenerator" class="com.raytheon.uf.edex.plugin.qpf.QPFGenerator"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/res/spring/satellite-mcidas-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/res/spring/satellite-mcidas-ingest.xml
index 09ee702635..fe110e1c38 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/res/spring/satellite-mcidas-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/res/spring/satellite-mcidas-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="jms-satellite-mcidas" class="org.apache.camel.component.jms.JmsComponent">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-common.xml
index 233a674057..2b47880d4d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="scanPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-ingest.xml
index 5e37b74bd7..e435865a1c 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="scanMenuCreator" class="com.raytheon.uf.edex.dat.utils.DatMenuUtil" depends-on="pointDataRegistered, vilGenerator, qpfGenerator, preciprateGenerator, fogGenerator, cwatGenerator, ffmpGenerator"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-common.xml
index 97c251af72..63689cce0b 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="svrwxPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-ingest.xml
index 4372dcdae1..0a2fd1ce3c 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="svrwxDecoder" class="com.raytheon.uf.edex.plugin.svrwx.SvrWxDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-common.xml
index 6b1e02ab13..f4495e7045 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="tcgPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-ingest.xml
index 9becac0d61..0ee9c02e29 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="tcgDecoder" class="com.raytheon.uf.edex.plugin.tcg.TCGDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-common.xml
index b7162c1aca..5fffbf51bc 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="tcsPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-ingest.xml
index c56190dd7f..fe691028b1 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="tcsDecoder" class="com.raytheon.uf.edex.plugin.tcs.TCSDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-common.xml
index 5f4f8f05dc..153d3ec87d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="vaaPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-ingest.xml
index 7bb514ec07..e743beb90d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="vaaDecoder" class="com.raytheon.uf.edex.plugin.vaa.VAADecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-common.xml
index 37a8781614..007a9d593b 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="vilPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-ingest.xml
index 59b75471fc..d498e14173 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
    
    <bean id="vilGenerator" class="com.raytheon.uf.edex.plugin.vil.VILGenerator"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.pointdata/res/spring/pointdata-common.xml b/edexOsgi/com.raytheon.uf.edex.pointdata/res/spring/pointdata-common.xml
index e54e5b04c2..1ed9415a27 100644
--- a/edexOsgi/com.raytheon.uf.edex.pointdata/res/spring/pointdata-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.pointdata/res/spring/pointdata-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
    	<bean id="pointdataCommonPluginProperties" class="com.raytheon.uf.edex.database.DatabasePluginProperties">
 		<property name="pluginFQN" value="com.raytheon.uf.common.pointdata" />
diff --git a/edexOsgi/com.raytheon.uf.edex.pointdata/res/spring/pointdata-request.xml b/edexOsgi/com.raytheon.uf.edex.pointdata/res/spring/pointdata-request.xml
index 5df2bc86cd..86e9f18003 100644
--- a/edexOsgi/com.raytheon.uf.edex.pointdata/res/spring/pointdata-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.pointdata/res/spring/pointdata-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
    
    <bean id="adaptivePlotHandler" class="com.raytheon.uf.edex.pointdata.NewAdaptivePlotHandler"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring-impl.xml b/edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring-impl.xml
index 0aaf82507a..4183f1400d 100644
--- a/edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring-impl.xml
+++ b/edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring-impl.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
  
 	<bean id="purgeManager" class="com.raytheon.uf.edex.purgesrv.PurgeManager">
 		<property name="clusterLimit" value="${purge.clusterlimit}"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring.xml b/edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring.xml
index ac4a0d03bf..c5b45eb584 100644
--- a/edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-constants.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-constants.xml
index ff6e4b5004..0c4587a0b2 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-constants.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-constants.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
   http://www.springframework.org/schema/tx
   http://www.springframework.org/schema/tx/spring-tx.xsd">
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-impl.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-impl.xml
index fe48a8eb3f..99c0cd0ad0 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-impl.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-impl.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean id="edexRegistryManager"
 		class="com.raytheon.uf.edex.registry.ebxml.util.EDEXRegistryManager">
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-querytypes.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-querytypes.xml
index 24498f5bef..39a82e7c24 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-querytypes.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-querytypes.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="queryTypeManager"
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-registry-dao.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-registry-dao.xml
index 01c216e12d..e5dc2e3877 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-registry-dao.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-registry-dao.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="registryObjectDao"
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-registry-encoder.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-registry-encoder.xml
index 4fdb0ed591..88579218e5 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-registry-encoder.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-registry-encoder.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="registryEncoderType"
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-registry-init.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-registry-init.xml
index 28e5ba5c27..ff1c70b6c7 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-registry-init.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-registry-init.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
 	<bean id="DbInit" class="com.raytheon.uf.edex.registry.ebxml.dao.DbInit">
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-subscription-edex-impl.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-subscription-edex-impl.xml
index 6135bd92bc..2374a256b9 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-subscription-edex-impl.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-subscription-edex-impl.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <camelContext id="ebxml-notification"
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-subscription.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-subscription.xml
index 070455b876..3eed2007c6 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-subscription.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-subscription.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
     <bean id="notificationListenerFactory"
         class="com.raytheon.uf.edex.registry.ebxml.services.notification.NotificationListenerFactory">
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client-route.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client-route.xml
index efa9085435..803bd3f7bf 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client-route.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client-route.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
     <camelContext id="server-camel"
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client.xml
index 0714003a59..feeea39db4 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
   <bean id="handlerRegistry" class="com.raytheon.uf.edex.auth.HandlerRegistry" factory-method="getInstance"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-validator-plugins.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-validator-plugins.xml
index 5f3a7490af..e8f14c17f2 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-validator-plugins.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-validator-plugins.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
     <bean id="validatorPluginRegistry" factory-bean="validatorServiceImpl"
         factory-method="getPluginValidatorRegistry" />
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webserver.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webserver.xml
index dc363b4198..f843c504dc 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webserver.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webserver.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
   http://www.springframework.org/schema/tx
   http://www.springframework.org/schema/tx/spring-tx.xsd">
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webservices.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webservices.xml
index 21c1523be7..6ccfe6d02e 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webservices.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webservices.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<!-- QUERY -->
 	<!-- Define concrete implementation of the service -->
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-xacml.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-xacml.xml
index 73c8c819d6..40c50b1102 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-xacml.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-xacml.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="XACMLPolicyEnforcementPoint"
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml.xml
index d16644ca6d..6357a2eae9 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
   http://www.springframework.org/schema/tx
   http://www.springframework.org/schema/tx/spring-tx.xsd">
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/webServiceBeans.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/webServiceBeans.xml
index c9d8e2ba83..3dd0a9cc26 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/webServiceBeans.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/webServiceBeans.xml
@@ -2,7 +2,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
 	xmlns:jaxrs="http://cxf.apache.org/jaxrs"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans 
-	http://www.springframework.org/schema/beans/spring-beans-2.5.xsd   
+	http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
   	http://camel.apache.org/schema/spring 
   	http://camel.apache.org/schema/spring/camel-spring.xsd
   	http://cxf.apache.org/jaxws
diff --git a/edexOsgi/com.raytheon.uf.edex.site/res/spring/site-common.xml b/edexOsgi/com.raytheon.uf.edex.site/res/spring/site-common.xml
index 97fd97d600..da0f351d06 100644
--- a/edexOsgi/com.raytheon.uf.edex.site/res/spring/site-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.site/res/spring/site-common.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
   	<bean id="siteActivateNotifyFilter"
diff --git a/edexOsgi/com.raytheon.uf.edex.site/res/spring/site-request.xml b/edexOsgi/com.raytheon.uf.edex.site/res/spring/site-request.xml
index 5c77463e73..ae6860d623 100644
--- a/edexOsgi/com.raytheon.uf.edex.site/res/spring/site-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.site/res/spring/site-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
     <bean id="ValidateConfigRequestHandler"
diff --git a/edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml b/edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
index 985079cecc..ab1bdb2fa1 100644
--- a/edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
+++ b/edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
@@ -2,7 +2,7 @@
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans
-  http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
+  http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="statsPurge"
diff --git a/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-common.xml b/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-common.xml
index bbe0fad04e..ff3bc6ccbe 100644
--- a/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="statsDatabaseProperties" class="com.raytheon.uf.edex.database.DatabasePluginProperties">
diff --git a/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml b/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml
index 99a7836afb..1aa4ed714a 100644
--- a/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="statsGraphDataHandler" class="com.raytheon.uf.edex.stats.handler.GraphDataHandler" >
diff --git a/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml b/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml
index 1e48fe5d46..fd56ce73b7 100644
--- a/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<!-- Need to set up connect between cave and edex 
diff --git a/edexOsgi/com.raytheon.uf.edex.tafqueue/res/spring/tafqueue-request.xml b/edexOsgi/com.raytheon.uf.edex.tafqueue/res/spring/tafqueue-request.xml
index b60dcba197..669c2d5838 100644
--- a/edexOsgi/com.raytheon.uf.edex.tafqueue/res/spring/tafqueue-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.tafqueue/res/spring/tafqueue-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="TafQueueRequestHandler"
diff --git a/edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-common.xml b/edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-common.xml
index d51c238e8f..baaad49afe 100644
--- a/edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="textdbsrv" class="com.raytheon.uf.edex.services.TextDBSrv" />
diff --git a/edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml b/edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
index 342c0c1afb..d0bbfc2f79 100644
--- a/edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
     <camelContext id="textdbsrv-request-camel" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">
     
diff --git a/edexOsgi/com.raytheon.uf.edex.useradmin/res/spring/useradmin-request.xml b/edexOsgi/com.raytheon.uf.edex.useradmin/res/spring/useradmin-request.xml
index cc9ccca7b4..1d8a5a43a6 100644
--- a/edexOsgi/com.raytheon.uf.edex.useradmin/res/spring/useradmin-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.useradmin/res/spring/useradmin-request.xml
@@ -1,8 +1,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+  http://www.springframework.org/schema/util/spring-util-3.1.xsd">
 
     <bean id="userAdminAuthorization"
         class="com.raytheon.uf.edex.useradmin.services.UserAdminPrivilegedRequestHandler" />
diff --git a/ncep/gov.noaa.nws.ncep.edex.common/res/spring/ncep-common.xml b/ncep/gov.noaa.nws.ncep.edex.common/res/spring/ncep-common.xml
index 23e70d988e..42edb8ab5f 100644
--- a/ncep/gov.noaa.nws.ncep.edex.common/res/spring/ncep-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.common/res/spring/ncep-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.common/res/spring/ncinventory-request.xml b/ncep/gov.noaa.nws.ncep.edex.common/res/spring/ncinventory-request.xml
index 430b47502d..80745b2470 100644
--- a/ncep/gov.noaa.nws.ncep.edex.common/res/spring/ncinventory-request.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.common/res/spring/ncinventory-request.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 <!--  for the ThriftClient requests -->  
diff --git a/ncep/gov.noaa.nws.ncep.edex.ingest.grib.util/res/spring/ncep-util-on-edex-ingestGrib.xml b/ncep/gov.noaa.nws.ncep.edex.ingest.grib.util/res/spring/ncep-util-on-edex-ingestGrib.xml
index 3274327ec2..fd81e95b04 100644
--- a/ncep/gov.noaa.nws.ncep.edex.ingest.grib.util/res/spring/ncep-util-on-edex-ingestGrib.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.ingest.grib.util/res/spring/ncep-util-on-edex-ingestGrib.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
   <!-- ncep logger setting on edex ingest process web interface -->
diff --git a/ncep/gov.noaa.nws.ncep.edex.ingest.util/res/spring/ncep-util-on-edex-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.ingest.util/res/spring/ncep-util-on-edex-ingest.xml
index 59f5804387..4bae59dac3 100644
--- a/ncep/gov.noaa.nws.ncep.edex.ingest.util/res/spring/ncep-util-on-edex-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.ingest.util/res/spring/ncep-util-on-edex-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
   <!-- ncep logger setting on edex ingest process web interface -->
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/res/spring/airmet-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/res/spring/airmet-common.xml
index bbc6cb6d8b..64a3061d0b 100755
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/res/spring/airmet-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/res/spring/airmet-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="airmetPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/res/spring/airmet-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/res/spring/airmet-ingest.xml
index ac3df1b686..a526d3aa1a 100755
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/res/spring/airmet-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/res/spring/airmet-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	
    <bean id="airmetDecoder" class="gov.noaa.nws.ncep.edex.plugin.airmet.decoder.AirmetDecoder">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/res/spring/atcf-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/res/spring/atcf-common.xml
index 6459154353..c6187f6b85 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/res/spring/atcf-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/res/spring/atcf-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/res/spring/atcf-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/res/spring/atcf-ingest.xml
index df45879020..62ea65211a 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/res/spring/atcf-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/res/spring/atcf-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
        
 	
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.aww/res/spring/aww-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.aww/res/spring/aww-common.xml
index 0274e238e5..03d3051661 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.aww/res/spring/aww-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.aww/res/spring/aww-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="awwPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.aww/res/spring/aww-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.aww/res/spring/aww-ingest.xml
index 4be132abea..d6305c2d79 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.aww/res/spring/aww-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.aww/res/spring/aww-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
   
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/res/spring/convsigmet-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/res/spring/convsigmet-common.xml
index 1b3d3f6b32..86b179e852 100755
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/res/spring/convsigmet-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/res/spring/convsigmet-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="convsigmetPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/res/spring/convsigmet-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/res/spring/convsigmet-ingest.xml
index c4194f4d77..33b05b3636 100755
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/res/spring/convsigmet-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/res/spring/convsigmet-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
     
     <bean id="convsigmetDecoder" class="gov.noaa.nws.ncep.edex.plugin.convsigmet.decoder.ConvSigmetDecoder">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/res/spring/ffg-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/res/spring/ffg-common.xml
index f0852d20bd..ff4de29f09 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/res/spring/ffg-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/res/spring/ffg-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/res/spring/ffg-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/res/spring/ffg-ingest.xml
index e728d49b24..18c2662fd6 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/res/spring/ffg-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/res/spring/ffg-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
     
     <bean id="ffgDecoder" class="gov.noaa.nws.ncep.edex.plugin.ffg.decoder.FfgDecoder">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-common.xml
index 8cb6f5b9d1..aa450f1907 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="geomagPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml
index cf9a61ed23..a51143072a 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<!-- bean id="jms-geomag" class="org.apache.camel.component.jms.JmsComponent">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.idft/res/spring/idft-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.idft/res/spring/idft-common.xml
index 66de5157b3..931435278d 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.idft/res/spring/idft-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.idft/res/spring/idft-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.idft/res/spring/idft-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.idft/res/spring/idft-ingest.xml
index c503eada75..7cac71ed66 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.idft/res/spring/idft-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.idft/res/spring/idft-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/res/spring/intlsigmet-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/res/spring/intlsigmet-common.xml
index a0e3834eee..2c68479afa 100755
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/res/spring/intlsigmet-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/res/spring/intlsigmet-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="intlsigmetPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/res/spring/intlsigmet-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/res/spring/intlsigmet-ingest.xml
index edb2897706..f2d78969b7 100755
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/res/spring/intlsigmet-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/res/spring/intlsigmet-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	
    <bean id="intlsigmetDecoder" class="gov.noaa.nws.ncep.edex.plugin.intlsigmet.decoder.IntlSigmetDecoder">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/res/spring/mcidas-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/res/spring/mcidas-common.xml
index 7753b30359..d1eca5f5d3 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/res/spring/mcidas-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/res/spring/mcidas-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="mcidasPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/res/spring/mcidas-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/res/spring/mcidas-ingest.xml
index 5c9d726877..d93248e35f 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/res/spring/mcidas-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/res/spring/mcidas-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
     <bean id="mcidasDao" class="gov.noaa.nws.ncep.common.dataplugin.mcidas.dao.McidasDao">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/res/spring/mosaic-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/res/spring/mosaic-common.xml
index 833d9856a6..f99dd73009 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/res/spring/mosaic-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/res/spring/mosaic-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="mosaicProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/res/spring/mosaic-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/res/spring/mosaic-ingest.xml
index ccf83cc940..207c485728 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/res/spring/mosaic-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/res/spring/mosaic-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-common.xml
index dd55b65f6f..188042c5cb 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ncairepPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
index f74d353714..1aff0bdba6 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ncairepDecoder" class="gov.noaa.nws.ncep.edex.plugin.ncairep.NcAirepDecoder">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-common.xml
index 8fb60806b6..a659c73ace 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
index 10be9a7afa..50fadac77d 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ncccfpDecoder" class="gov.noaa.nws.ncep.edex.plugin.ncccfp.decoder.NcccfpDecoder">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-common.xml
index b1639366c5..f44ba86407 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="ncgribPathProvider" class="gov.noaa.nws.ncep.common.dataplugin.ncgrib.NcgribPathProvider" />
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
index 0914701dab..37854997ac 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   	 <bean id="gribDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
index b02ce8c9cd..0c4070985b 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<!-- Done to force instantiation of the NcgribTables -->
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-request.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-request.xml
index 2afb5e4908..563ea07504 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-request.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
    <bean id="ncgridDataQueryHandler" class="gov.noaa.nws.ncep.edex.plugin.ncgrib.handler.NcgridDataHandler" />
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/res/spring/ncpafm-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/res/spring/ncpafm-common.xml
index c4546b1b44..5c9d5ae8e9 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/res/spring/ncpafm-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/res/spring/ncpafm-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/res/spring/ncpafm-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/res/spring/ncpafm-ingest.xml
index 1e9b75ae7e..5420b7b084 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/res/spring/ncpafm-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/res/spring/ncpafm-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ncpafmDecoder" class="gov.noaa.nws.ncep.edex.plugin.ncpafm.decoder.NcPafmDecoder">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-common.xml
index 80cb6c103e..33e0233cfa 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ncpirepPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
index 6b2d398510..58980d34f4 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <!--bean id="ncpirepDao" class="gov.noaa.nws.ncep.common.dataplugin.ncpirep.dao.NcPirepDao">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-common.xml
index 5eb29eef07..0a4b55b70c 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ncscatPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
index 1645816cef..341fe5e257 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="ncscatDao" class="gov.noaa.nws.ncep.common.dataplugin.ncscat.dao.NcscatDao">
 	<constructor-arg ref="ncscatPluginName"/> 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/res/spring/ncscd-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/res/spring/ncscd-common.xml
index e3ca5172ae..46c564f478 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/res/spring/ncscd-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/res/spring/ncscd-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
         <bean id="ncscdPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/res/spring/ncscd-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/res/spring/ncscd-ingest.xml
index fe9fe3ba52..0b569dc205 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/res/spring/ncscd-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/res/spring/ncscd-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/spring/nctaf-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/spring/nctaf-common.xml
index 6fb7f9e1d8..258d0f8899 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/spring/nctaf-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/spring/nctaf-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="nctafPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/spring/nctaf-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/spring/nctaf-ingest.xml
index 46050105ac..5d1833dd1c 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/spring/nctaf-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/spring/nctaf-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="nctafDecoder" class="gov.noaa.nws.ncep.edex.plugin.nctaf.decoder.NcTafDecoder" />
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/res/spring/nctext-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/res/spring/nctext-common.xml
index e93719d137..eba328510f 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/res/spring/nctext-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/res/spring/nctext-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
   	<bean id="nctextPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/res/spring/nctext-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/res/spring/nctext-ingest.xml
index aceee3691b..66f3397aac 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/res/spring/nctext-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/res/spring/nctext-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
   
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/res/spring/ncuair-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/res/spring/ncuair-common.xml
index a601a5d6fc..baba049f9c 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/res/spring/ncuair-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/res/spring/ncuair-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/res/spring/ncuair-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/res/spring/ncuair-ingest.xml
index 48bc2e761e..8e217f9a50 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/res/spring/ncuair-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/res/spring/ncuair-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
        
 	
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/res/spring/nonconvsigmet-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/res/spring/nonconvsigmet-common.xml
index afda2dc1c9..3402e2ef08 100755
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/res/spring/nonconvsigmet-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/res/spring/nonconvsigmet-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="nonconvsigmetPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/res/spring/nonconvsigmet-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/res/spring/nonconvsigmet-ingest.xml
index 8c3451fef8..5229a6aa88 100755
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/res/spring/nonconvsigmet-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/res/spring/nonconvsigmet-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
        
     <bean id="nonconvsigmetDecoder" class="gov.noaa.nws.ncep.edex.plugin.nonconvsigmet.decoder.NonConvSigmetDecoder">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-common.xml
index f6ec4fca2c..5c87da34b4 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ntransPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
index 26d5824e66..0f40a15261 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="ntransDao" class="gov.noaa.nws.ncep.common.dataplugin.ntrans.dao.NtransDao">
 	<constructor-arg ref="ntransPluginName"/> 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.pgen/res/spring/pgen-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.pgen/res/spring/pgen-common.xml
index cd9b562e80..f4d5c37a0b 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.pgen/res/spring/pgen-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.pgen/res/spring/pgen-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="pgenPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.pgen/res/spring/pgen-request.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.pgen/res/spring/pgen-request.xml
index af3f885208..6ad9194010 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.pgen/res/spring/pgen-request.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.pgen/res/spring/pgen-request.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
     <bean id="StoreActivityHandler"
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/res/spring/sgwh-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/res/spring/sgwh-common.xml
index cab225c56e..fd80871df3 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/res/spring/sgwh-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/res/spring/sgwh-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="sgwhPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/res/spring/sgwh-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/res/spring/sgwh-ingest.xml
index 20e13b7f50..5edb7aa9b0 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/res/spring/sgwh-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/res/spring/sgwh-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="sgwhDecoder"
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/res/spring/sgwhv-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/res/spring/sgwhv-common.xml
index 7f7d385e9a..63293cb3cb 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/res/spring/sgwhv-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/res/spring/sgwhv-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="sgwhvPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/res/spring/sgwhv-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/res/spring/sgwhv-ingest.xml
index 82eb409405..234ce1dc85 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/res/spring/sgwhv-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/res/spring/sgwhv-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="sgwhvDecoder"
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/res/spring/solarimage-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/res/spring/solarimage-common.xml
index 1c3b57f70c..e5856fde78 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/res/spring/solarimage-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/res/spring/solarimage-common.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="solarimagePluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/res/spring/solarimage-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/res/spring/solarimage-ingest.xml
index 5388744387..adb053b02f 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/res/spring/solarimage-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/res/spring/solarimage-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<!-- bean id="jms-solarimage" class="org.apache.camel.component.jms.JmsComponent">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/res/spring/ssha-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/res/spring/ssha-common.xml
index 23641e068c..c793c2caa8 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/res/spring/ssha-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/res/spring/ssha-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="sshaPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/res/spring/ssha-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/res/spring/ssha-ingest.xml
index b72a6c08c5..097bf3f68a 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/res/spring/ssha-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/res/spring/ssha-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="sshaDecoder"
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-common.xml
index 1add28cb42..9f9d86a697 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
index 6252dc2f43..2d40f061f8 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
        
 	
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/res/spring/tcm-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/res/spring/tcm-common.xml
index a4fe86c1f3..817a038ae5 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/res/spring/tcm-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/res/spring/tcm-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="tcmPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/res/spring/tcm-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/res/spring/tcm-ingest.xml
index 3da2e070bd..81cbbaace5 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/res/spring/tcm-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/res/spring/tcm-ingest.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="tcmDecoder" class="gov.noaa.nws.ncep.edex.plugin.tcm.decoder.TcmDecoder">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/res/spring/wcp-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/res/spring/wcp-common.xml
index 843dbe7cab..54d237439d 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/res/spring/wcp-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/res/spring/wcp-common.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/res/spring/wcp-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/res/spring/wcp-ingest.xml
index d31fef2767..ef56d2060c 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/res/spring/wcp-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/res/spring/wcp-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.purgeutil/res/spring/purgeutil-request.xml b/ncep/gov.noaa.nws.ncep.edex.purgeutil/res/spring/purgeutil-request.xml
index 259c433be6..923a4d9398 100644
--- a/ncep/gov.noaa.nws.ncep.edex.purgeutil/res/spring/purgeutil-request.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.purgeutil/res/spring/purgeutil-request.xml
@@ -1,7 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
   <bean id="purgeutil" class="gov.noaa.nws.ncep.edex.purgeutil.DbPurge" />
diff --git a/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/res/spring/regionalsat-ingest.xml b/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/res/spring/regionalsat-ingest.xml
index 1f2bdda352..4807c4893b 100644
--- a/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/res/spring/regionalsat-ingest.xml
+++ b/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/res/spring/regionalsat-ingest.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	
 	<bean id="jms-regionalsat" class="org.apache.camel.component.jms.JmsComponent">