diff --git a/applications/accounting/webapp/accounting/WEB-INF/web.xml b/applications/accounting/webapp/accounting/WEB-INF/web.xml
index 1e9aba4f121..b79233705ea 100644
--- a/applications/accounting/webapp/accounting/WEB-INF/web.xml
+++ b/applications/accounting/webapp/accounting/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
     <display-name>Apache OFBiz - Accounting Manager</display-name>
     <description>Accounting Manager Module of the Apache OFBiz Project</description>
 
diff --git a/applications/accounting/webapp/ap/WEB-INF/web.xml b/applications/accounting/webapp/ap/WEB-INF/web.xml
index 0d8c7fc418b..0f12f57ea2c 100644
--- a/applications/accounting/webapp/ap/WEB-INF/web.xml
+++ b/applications/accounting/webapp/ap/WEB-INF/web.xml
@@ -15,7 +15,7 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
     <display-name>Apache OFBiz - Account Payable</display-name>
     <description>Accounting Payable Module of the Apache OFBiz Project</description>
 
diff --git a/applications/accounting/webapp/ar/WEB-INF/web.xml b/applications/accounting/webapp/ar/WEB-INF/web.xml
index f89ea17ef6e..23c89e65ba7 100644
--- a/applications/accounting/webapp/ar/WEB-INF/web.xml
+++ b/applications/accounting/webapp/ar/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
     <display-name>Apache OFBiz - Account Receivable</display-name>
     <description>Accounting Receivable Module of the Apache OFBiz Project</description>
 
diff --git a/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml b/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml
index 36b18b139e7..9691ceab535 100644
--- a/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml
+++ b/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml
@@ -19,7 +19,7 @@
     under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
     <display-name>Apache OFBiz - Setup Manager</display-name>
     <description>Setup Manager Module of the Apache OFBiz Project</description>
     
diff --git a/applications/commonext/webapp/ordermgr-js/WEB-INF/web.xml b/applications/commonext/webapp/ordermgr-js/WEB-INF/web.xml
index d99fc303dda..425ad2e1741 100644
--- a/applications/commonext/webapp/ordermgr-js/WEB-INF/web.xml
+++ b/applications/commonext/webapp/ordermgr-js/WEB-INF/web.xml
@@ -17,7 +17,7 @@
 -->
 
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
     <display-name>Empty placeholder</display-name>
     <description>Empty placeholder, see http://svn.apache.org/viewvc?view=revision&amp;revision=1612202 </description>
 </web-app>
diff --git a/applications/content/webapp/content/WEB-INF/web.xml b/applications/content/webapp/content/WEB-INF/web.xml
index 4b81cf9a04c..d27167403e3 100644
--- a/applications/content/webapp/content/WEB-INF/web.xml
+++ b/applications/content/webapp/content/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
     <display-name>Apache OFBiz - Content Manager</display-name>
     <description>Content Manager Module of the Apache OFBiz Project</description>
 
diff --git a/applications/content/webapp/contentimages/WEB-INF/web.xml b/applications/content/webapp/contentimages/WEB-INF/web.xml
index a7136b98b3c..35196caf1e2 100644
--- a/applications/content/webapp/contentimages/WEB-INF/web.xml
+++ b/applications/content/webapp/contentimages/WEB-INF/web.xml
@@ -17,7 +17,7 @@
 -->
 
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
     <display-name>Apache OFBiz - Content Empty placeholder</display-name>
     <description>Empty placeholder, see http://svn.apache.org/viewvc?view=revision&amp;revision=1658621 </description>
 </web-app>
diff --git a/applications/humanres/webapp/humanres/WEB-INF/web.xml b/applications/humanres/webapp/humanres/WEB-INF/web.xml
index 30586f929df..d4d9e7462dd 100644
--- a/applications/humanres/webapp/humanres/WEB-INF/web.xml
+++ b/applications/humanres/webapp/humanres/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
     <display-name>Apache OFBiz - HumanRes Manager</display-name>
     <description>HumanRes Manager Module of the Apache OFBiz Project</description>
 
diff --git a/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml b/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
index 624122385b7..25e6f158a23 100644
--- a/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
+++ b/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
     <display-name>Apache OFBiz - Manufacturing Manager</display-name>
     <description>Manufacturing Manager Module by TAU Informatica srl</description>
 
diff --git a/applications/marketing/webapp/marketing/WEB-INF/web.xml b/applications/marketing/webapp/marketing/WEB-INF/web.xml
index 6792e6d32ab..54ea1dc94db 100644
--- a/applications/marketing/webapp/marketing/WEB-INF/web.xml
+++ b/applications/marketing/webapp/marketing/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
   <display-name>Apache OFBiz - Marketing Manager</display-name>
   <description>Marketing Manager Module of the Apache OFBiz Project</description>
 
diff --git a/applications/marketing/webapp/sfa/WEB-INF/web.xml b/applications/marketing/webapp/sfa/WEB-INF/web.xml
index 0fef037714d..638e06a3b03 100644
--- a/applications/marketing/webapp/sfa/WEB-INF/web.xml
+++ b/applications/marketing/webapp/sfa/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
     <display-name>Apache OFBiz - SFA Manager</display-name>
     <description>SFA Manager Module of the Apache OFBiz Project</description>
 
diff --git a/applications/order/webapp/ordermgr/WEB-INF/web.xml b/applications/order/webapp/ordermgr/WEB-INF/web.xml
index 6ad5aa196a7..41265cc8ef2 100644
--- a/applications/order/webapp/ordermgr/WEB-INF/web.xml
+++ b/applications/order/webapp/ordermgr/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
     <display-name>Apache OFBiz - Order Manager</display-name>
     <description>Order Manager Module of the Apache OFBiz Project</description>
 
diff --git a/applications/party/webapp/partymgr/WEB-INF/web.xml b/applications/party/webapp/partymgr/WEB-INF/web.xml
index 9057e920f7c..09653c4d9bd 100644
--- a/applications/party/webapp/partymgr/WEB-INF/web.xml
+++ b/applications/party/webapp/partymgr/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
   <description>Party Manager Module of the Apache OFBiz Project</description>
   <display-name>Apache OFBiz - Party Manager</display-name>
 
diff --git a/applications/product/webapp/catalog/WEB-INF/web.xml b/applications/product/webapp/catalog/WEB-INF/web.xml
index 6d0f07d12e8..a79e79898a2 100644
--- a/applications/product/webapp/catalog/WEB-INF/web.xml
+++ b/applications/product/webapp/catalog/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
     <display-name>Apache OFBiz - Catalog</display-name>
     <description>Catalog Module of the Apache OFBiz Project</description>
 
diff --git a/applications/product/webapp/facility/WEB-INF/web.xml b/applications/product/webapp/facility/WEB-INF/web.xml
index 6a27b8177e9..0a3464f395a 100644
--- a/applications/product/webapp/facility/WEB-INF/web.xml
+++ b/applications/product/webapp/facility/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
     <display-name>Apache OFBiz - Facility Manager</display-name>
     <description>Facility Manager Module of the Apache OFBiz Project</description>
 
diff --git a/applications/workeffort/webapp/ical/WEB-INF/web.xml b/applications/workeffort/webapp/ical/WEB-INF/web.xml
index 47ed142574d..b890ca7b6f7 100644
--- a/applications/workeffort/webapp/ical/WEB-INF/web.xml
+++ b/applications/workeffort/webapp/ical/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
     <display-name>Apache OFBiz - iCalendar Server</display-name>
     <description>iCalendar Server Module of the Apache OFBiz Project</description>
 
diff --git a/applications/workeffort/webapp/workeffort/WEB-INF/web.xml b/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
index 2df2de0fcfe..c8aeb25ce08 100644
--- a/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
+++ b/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
     <display-name>Apache OFBiz - Work Manager</display-name>
     <description>Work Manager Module of the Apache OFBiz Project</description>
 
diff --git a/framework/resources/templates/web.xml b/framework/resources/templates/web.xml
index f64d878de89..2ca1b356d13 100644
--- a/framework/resources/templates/web.xml
+++ b/framework/resources/templates/web.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
     <display-name>Apache OFBiz - @component-resource-name@ Component</display-name>
     <description>@component-resource-name@ Component of the Apache OFBiz Project</description>
 
diff --git a/framework/webtools/webapp/webtools/WEB-INF/web.xml b/framework/webtools/webapp/webtools/WEB-INF/web.xml
index 900ca0e27cd..635897b320c 100644
--- a/framework/webtools/webapp/webtools/WEB-INF/web.xml
+++ b/framework/webtools/webapp/webtools/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
     <display-name>Apache OFBiz - Web Tools</display-name>
     <description>Common Application Components of the Apache OFBiz Project</description>
 
diff --git a/themes/bluelight/webapp/bluelight/WEB-INF/web.xml b/themes/bluelight/webapp/bluelight/WEB-INF/web.xml
index eea454d72a6..cf99ec934f3 100644
--- a/themes/bluelight/webapp/bluelight/WEB-INF/web.xml
+++ b/themes/bluelight/webapp/bluelight/WEB-INF/web.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
   <display-name>Apache OFBiz - bluelight Visual Theme</display-name>
   <description>bluelight Visual Theme</description>
 
diff --git a/themes/common-theme/webapp/common/WEB-INF/web.xml b/themes/common-theme/webapp/common/WEB-INF/web.xml
index 75ade0c2093..dd502c7a834 100644
--- a/themes/common-theme/webapp/common/WEB-INF/web.xml
+++ b/themes/common-theme/webapp/common/WEB-INF/web.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
   <display-name>Apache OFBiz - Common Theme</display-name>
   <description>Common Theme</description>
 
diff --git a/themes/common-theme/webapp/images/WEB-INF/web.xml b/themes/common-theme/webapp/images/WEB-INF/web.xml
index 593a5f2a6e5..54c7c3113fd 100644
--- a/themes/common-theme/webapp/images/WEB-INF/web.xml
+++ b/themes/common-theme/webapp/images/WEB-INF/web.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
   <display-name>Apache OFBiz - demostore images</display-name>
   <description>Demo Store Images for the Apache OFBiz Project</description>
 
diff --git a/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml b/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml
index 0b061ecd7f6..9aedae50a55 100644
--- a/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml
+++ b/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
     <display-name>Apache OFBiz - Flat Grey Visual Theme</display-name>
     <description>Flat Grey Visual Theme</description>
     
diff --git a/themes/rainbowstone/webapp/rainbowstone/WEB-INF/web.xml b/themes/rainbowstone/webapp/rainbowstone/WEB-INF/web.xml
index 4f5bea62042..3aea413ce38 100644
--- a/themes/rainbowstone/webapp/rainbowstone/WEB-INF/web.xml
+++ b/themes/rainbowstone/webapp/rainbowstone/WEB-INF/web.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
     <display-name>Open For Business - Rainbowstone Visual Theme</display-name>
     <description>Rainbowstone Visual Theme</description>
     
diff --git a/themes/tomahawk/webapp/tomahawk/WEB-INF/web.xml b/themes/tomahawk/webapp/tomahawk/WEB-INF/web.xml
index 8e162622c63..33cd7231c59 100644
--- a/themes/tomahawk/webapp/tomahawk/WEB-INF/web.xml
+++ b/themes/tomahawk/webapp/tomahawk/WEB-INF/web.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0">
   <display-name>Apache OFBiz - Tomahawk Visual Theme</display-name>
   <description>Tomahawk Visual Theme</description>