You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2021/07/20 05:43:34 UTC

[ofbiz-framework] branch release17.12 updated: Fixed: Add http to https redirect rule for ofbiz.apache.org (OFBIZ-10590)

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release17.12 by this push:
     new 2b15c03  Fixed: Add http to https redirect rule for ofbiz.apache.org (OFBIZ-10590)
2b15c03 is described below

commit 2b15c0302c52c686b7f1a4eb326eec0629d68317
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Tue Jul 20 07:35:11 2021 +0200

    Fixed: Add http to https redirect rule for ofbiz.apache.org (OFBIZ-10590)
    
    This prevented to run the stable demo
---
 applications/accounting/config/AccountingEntityLabels.xml         | 2 +-
 applications/accounting/config/AccountingErrorUiLabels.xml        | 2 +-
 applications/accounting/config/AccountingUiLabels.xml             | 2 +-
 applications/accounting/entitydef/eecas.xml                       | 2 +-
 applications/accounting/entitydef/entitymodel_reports.xml         | 2 +-
 applications/accounting/ofbiz-component.xml                       | 2 +-
 applications/accounting/servicedef/groups.xml                     | 2 +-
 applications/accounting/servicedef/secas.xml                      | 2 +-
 applications/accounting/servicedef/secas_invoice.xml              | 2 +-
 applications/accounting/servicedef/secas_ledger.xml               | 2 +-
 applications/accounting/servicedef/secas_payment.xml              | 2 +-
 applications/accounting/servicedef/services_admin.xml             | 2 +-
 applications/accounting/servicedef/services_agreement.xml         | 2 +-
 applications/accounting/servicedef/services_authorizedotnet.xml   | 2 +-
 applications/accounting/servicedef/services_billing.xml           | 2 +-
 applications/accounting/servicedef/services_budget.xml            | 2 +-
 applications/accounting/servicedef/services_clearcommerce.xml     | 2 +-
 applications/accounting/servicedef/services_cost.xml              | 2 +-
 applications/accounting/servicedef/services_cybersource.xml       | 2 +-
 applications/accounting/servicedef/services_finaccount.xml        | 2 +-
 applications/accounting/servicedef/services_fixedasset.xml        | 2 +-
 applications/accounting/servicedef/services_invoice.xml           | 2 +-
 applications/accounting/servicedef/services_ledger.xml            | 2 +-
 applications/accounting/servicedef/services_orbital.xml           | 2 +-
 applications/accounting/servicedef/services_payment.xml           | 2 +-
 applications/accounting/servicedef/services_paymentgateway.xml    | 2 +-
 applications/accounting/servicedef/services_paymentmethod.xml     | 2 +-
 applications/accounting/servicedef/services_paypal.xml            | 2 +-
 applications/accounting/servicedef/services_pccharge.xml          | 2 +-
 applications/accounting/servicedef/services_perm.xml              | 2 +-
 applications/accounting/servicedef/services_rate.xml              | 2 +-
 applications/accounting/servicedef/services_rita.xml              | 2 +-
 applications/accounting/servicedef/services_sagepay.xml           | 2 +-
 applications/accounting/servicedef/services_securepay.xml         | 2 +-
 applications/accounting/servicedef/services_tax.xml               | 2 +-
 applications/accounting/servicedef/services_valuelink.xml         | 2 +-
 applications/accounting/servicedef/services_verisign.xml          | 2 +-
 applications/accounting/testdef/accountingtests.xml               | 2 +-
 applications/accounting/testdef/fixedassettests.xml               | 2 +-
 applications/accounting/testdef/invoicetests.xml                  | 2 +-
 applications/accounting/testdef/paymentappltests.xml              | 2 +-
 applications/accounting/testdef/paymenttests.xml                  | 2 +-
 applications/accounting/testdef/ratetests.xml                     | 2 +-
 applications/commonext/config/CommonExtUiLabels.xml               | 2 +-
 applications/commonext/config/SetupUiLabels.xml                   | 2 +-
 applications/commonext/entitydef/entitymodel.xml                  | 2 +-
 applications/commonext/ofbiz-component.xml                        | 2 +-
 applications/commonext/servicedef/secas.xml                       | 2 +-
 applications/commonext/servicedef/services.xml                    | 2 +-
 applications/component-load.xml                                   | 2 +-
 applications/content/config/ContentEntityLabels.xml               | 2 +-
 applications/content/config/ContentErrorUiLabels.xml              | 2 +-
 applications/content/config/ContentUiLabels.xml                   | 2 +-
 applications/content/entitydef/eecas.xml                          | 2 +-
 applications/content/ofbiz-component.xml                          | 2 +-
 applications/content/servicedef/mca.xml                           | 2 +-
 applications/content/servicedef/secas.xml                         | 2 +-
 applications/content/servicedef/services.xml                      | 2 +-
 applications/content/servicedef/services_commevent.xml            | 2 +-
 applications/content/servicedef/services_content.xml              | 2 +-
 applications/content/servicedef/services_contenttypes.xml         | 2 +-
 applications/content/servicedef/services_data.xml                 | 2 +-
 applications/content/servicedef/services_document.xml             | 2 +-
 applications/content/servicedef/services_output.xml               | 2 +-
 applications/content/servicedef/services_survey.xml               | 2 +-
 applications/content/servicedef/services_website.xml              | 2 +-
 applications/datamodel/entitydef/accounting-entitymodel.xml       | 2 +-
 applications/datamodel/entitydef/content-entitymodel.xml          | 2 +-
 applications/datamodel/entitydef/humanres-entitymodel.xml         | 2 +-
 applications/datamodel/entitydef/manufacturing-entitymodel.xml    | 2 +-
 applications/datamodel/entitydef/marketing-entitymodel.xml        | 2 +-
 applications/datamodel/entitydef/order-entitymodel.xml            | 2 +-
 applications/datamodel/entitydef/party-entitymodel.xml            | 2 +-
 applications/datamodel/entitydef/product-entitymodel.xml          | 2 +-
 applications/datamodel/entitydef/shipment-entitymodel.xml         | 2 +-
 applications/datamodel/entitydef/workeffort-entitymodel.xml       | 2 +-
 applications/datamodel/ofbiz-component.xml                        | 2 +-
 applications/humanres/config/HumanResEntityLabels.xml             | 2 +-
 applications/humanres/config/HumanResErrorUiLabels.xml            | 2 +-
 applications/humanres/config/HumanResUiLabels.xml                 | 2 +-
 applications/humanres/ofbiz-component.xml                         | 2 +-
 applications/humanres/servicedef/services.xml                     | 2 +-
 applications/humanres/servicedef/services_ability.xml             | 2 +-
 applications/humanres/servicedef/services_employment.xml          | 2 +-
 applications/humanres/servicedef/services_position.xml            | 2 +-
 applications/manufacturing/config/ManufacturingEntityLabels.xml   | 2 +-
 .../manufacturing/config/ManufacturingReportsUiLabels.xml         | 2 +-
 applications/manufacturing/config/ManufacturingUiLabels.xml       | 2 +-
 applications/manufacturing/ofbiz-component.xml                    | 2 +-
 applications/manufacturing/servicedef/secas.xml                   | 2 +-
 applications/manufacturing/servicedef/services.xml                | 2 +-
 applications/manufacturing/servicedef/services_bom.xml            | 2 +-
 applications/manufacturing/servicedef/services_calendar.xml       | 2 +-
 applications/manufacturing/servicedef/services_formula.xml        | 2 +-
 applications/manufacturing/servicedef/services_mrp.xml            | 2 +-
 applications/manufacturing/servicedef/services_production_run.xml | 2 +-
 applications/manufacturing/servicedef/services_routing.xml        | 2 +-
 applications/manufacturing/testdef/productionruntests.xml         | 2 +-
 applications/marketing/config/MarketingEntityLabels.xml           | 2 +-
 applications/marketing/config/MarketingUiLabels.xml               | 2 +-
 applications/marketing/ofbiz-component.xml                        | 2 +-
 applications/marketing/servicedef/secas.xml                       | 2 +-
 applications/marketing/servicedef/services.xml                    | 2 +-
 applications/marketing/servicedef/services_contact.xml            | 2 +-
 applications/marketing/servicedef/services_opportunity.xml        | 2 +-
 applications/marketing/testdef/MarketingTests.xml                 | 2 +-
 applications/order/config/OrderEntityLabels.xml                   | 2 +-
 applications/order/config/OrderErrorUiLabels.xml                  | 2 +-
 applications/order/config/OrderUiLabels.xml                       | 2 +-
 applications/order/entitydef/eecas.xml                            | 2 +-
 applications/order/entitydef/entitymodel_view.xml                 | 2 +-
 applications/order/minilang/thirdparty/taxware/TaxwareFiles.xml   | 2 +-
 .../order/minilang/thirdparty/zipsales/ZipSalesTaxTables.xml      | 2 +-
 applications/order/ofbiz-component.xml                            | 2 +-
 applications/order/servicedef/secas.xml                           | 2 +-
 applications/order/servicedef/services.xml                        | 2 +-
 applications/order/servicedef/services_cart.xml                   | 2 +-
 applications/order/servicedef/services_checkout.xml               | 2 +-
 applications/order/servicedef/services_order.xml                  | 2 +-
 applications/order/servicedef/services_perm.xml                   | 2 +-
 applications/order/servicedef/services_quote.xml                  | 2 +-
 applications/order/servicedef/services_request.xml                | 2 +-
 applications/order/servicedef/services_requirement.xml            | 2 +-
 applications/order/servicedef/services_reservations.xml           | 2 +-
 applications/order/servicedef/services_return.xml                 | 2 +-
 applications/order/servicedef/services_shoppinglist.xml           | 2 +-
 applications/order/testdef/CustRequestTests.xml                   | 2 +-
 applications/order/testdef/FinAccountTests.xml                    | 2 +-
 applications/order/testdef/OrderTest.xml                          | 2 +-
 applications/order/testdef/ShoppingCartTests.xml                  | 2 +-
 applications/order/testdef/ShoppingListTests.xml                  | 2 +-
 applications/order/testdef/quotetests.xml                         | 2 +-
 applications/party/config/PartyEntityLabels.xml                   | 2 +-
 applications/party/config/PartyErrorUiLabels.xml                  | 2 +-
 applications/party/config/PartyUiLabels.xml                       | 2 +-
 applications/party/ofbiz-component.xml                            | 2 +-
 applications/party/servicedef/mcas.xml                            | 2 +-
 applications/party/servicedef/secas.xml                           | 2 +-
 applications/party/servicedef/services.xml                        | 2 +-
 applications/party/servicedef/services_agreement.xml              | 2 +-
 applications/party/servicedef/services_communication.xml          | 2 +-
 applications/party/servicedef/services_contact.xml                | 2 +-
 applications/party/servicedef/services_party.xml                  | 2 +-
 applications/party/servicedef/services_view.xml                   | 2 +-
 applications/party/testdef/PartyContactMechTests.xml              | 2 +-
 applications/party/testdef/PartyStatusChangeTests.xml             | 2 +-
 applications/party/testdef/PartyTests.xml                         | 2 +-
 applications/product/config/ProductEntityLabels.xml               | 2 +-
 applications/product/config/ProductErrorUiLabels.xml              | 2 +-
 applications/product/config/ProductPromoUiLabels.xml              | 2 +-
 applications/product/config/ProductUiLabels.xml                   | 2 +-
 applications/product/entitydef/eecas.xml                          | 2 +-
 applications/product/entitydef/entitymodel_view.xml               | 2 +-
 applications/product/ofbiz-component.xml                          | 2 +-
 applications/product/servicedef/groups.xml                        | 2 +-
 applications/product/servicedef/secas.xml                         | 2 +-
 applications/product/servicedef/secas_shipment.xml                | 2 +-
 applications/product/servicedef/services.xml                      | 2 +-
 applications/product/servicedef/services_config.xml               | 2 +-
 applications/product/servicedef/services_cost.xml                 | 2 +-
 applications/product/servicedef/services_facility.xml             | 2 +-
 applications/product/servicedef/services_feature.xml              | 2 +-
 applications/product/servicedef/services_inventory.xml            | 2 +-
 applications/product/servicedef/services_maint.xml                | 2 +-
 applications/product/servicedef/services_perm.xml                 | 2 +-
 applications/product/servicedef/services_picklist.xml             | 2 +-
 applications/product/servicedef/services_price.xml                | 2 +-
 applications/product/servicedef/services_pricepromo.xml           | 2 +-
 applications/product/servicedef/services_rental.xml               | 2 +-
 applications/product/servicedef/services_shipment.xml             | 2 +-
 applications/product/servicedef/services_shipment_dhl.xml         | 2 +-
 applications/product/servicedef/services_shipment_fedex.xml       | 2 +-
 applications/product/servicedef/services_shipment_ups.xml         | 2 +-
 applications/product/servicedef/services_shipment_usps.xml        | 2 +-
 applications/product/servicedef/services_shipmentgateway.xml      | 2 +-
 applications/product/servicedef/services_store.xml                | 2 +-
 applications/product/servicedef/services_subscription.xml         | 2 +-
 applications/product/servicedef/services_supplier.xml             | 2 +-
 applications/product/servicedef/services_uom.xml                  | 2 +-
 applications/product/servicedef/services_view.xml                 | 2 +-
 applications/product/testdef/CatalogTests.xml                     | 2 +-
 applications/product/testdef/CostTests.xml                        | 2 +-
 applications/product/testdef/FacilityTest.xml                     | 2 +-
 applications/product/testdef/GroupOrderTest.xml                   | 2 +-
 applications/product/testdef/ProductTagTest.xml                   | 2 +-
 applications/product/testdef/ProductTest.xml                      | 2 +-
 applications/securityext/config/EmailPasswordUiLabels.xml         | 2 +-
 applications/securityext/ofbiz-component.xml                      | 2 +-
 applications/securityext/servicedef/services.xml                  | 2 +-
 applications/workeffort/config/WorkEffortEntityLabels.xml         | 2 +-
 applications/workeffort/config/WorkEffortUiLabels.xml             | 2 +-
 applications/workeffort/entitydef/eecas.xml                       | 2 +-
 applications/workeffort/entitydef/entitymodel_view.xml            | 2 +-
 applications/workeffort/ofbiz-component.xml                       | 2 +-
 applications/workeffort/servicedef/secas.xml                      | 2 +-
 applications/workeffort/servicedef/service_groups.xml             | 2 +-
 applications/workeffort/servicedef/services.xml                   | 2 +-
 applications/workeffort/servicedef/services_timesheet.xml         | 2 +-
 applications/workeffort/servicedef/services_workeffort.xml        | 2 +-
 applications/workeffort/testdef/workefforttests.xml               | 2 +-
 framework/base/config/DateTimeLabels.xml                          | 2 +-
 framework/base/config/component-load.xml                          | 2 +-
 framework/base/config/jndiservers.xml                             | 2 +-
 framework/base/config/ofbiz-containers.xml                        | 2 +-
 framework/base/ofbiz-component.xml                                | 2 +-
 framework/base/testdef/basetests.xml                              | 2 +-
 framework/catalina/entitydef/entitymodel.xml                      | 2 +-
 framework/catalina/ofbiz-component.xml                            | 2 +-
 framework/common/config/CommonEntityLabels.xml                    | 2 +-
 framework/common/config/CommonErrorUiLabels.xml                   | 2 +-
 framework/common/config/CommonHelpUiLabels.xml                    | 2 +-
 framework/common/config/CommonPortalEntityLabels.xml              | 2 +-
 framework/common/config/CommonUiLabels.xml                        | 2 +-
 framework/common/config/PrefErrorUiLabels.xml                     | 2 +-
 framework/common/config/SecurityUiLabels.xml                      | 2 +-
 framework/common/config/SecurityextUiLabels.xml                   | 2 +-
 framework/common/config/TemporalExpressionUiLabels.xml            | 2 +-
 framework/common/entitydef/entitymodel.xml                        | 2 +-
 framework/common/ofbiz-component.xml                              | 2 +-
 framework/common/servicedef/groups_test.xml                       | 2 +-
 framework/common/servicedef/secas_cdyne.xml                       | 2 +-
 framework/common/servicedef/secas_test.xml                        | 2 +-
 framework/common/servicedef/services.xml                          | 2 +-
 framework/common/servicedef/services_cdyne.xml                    | 2 +-
 framework/common/servicedef/services_email.xml                    | 2 +-
 framework/common/servicedef/services_enum.xml                     | 2 +-
 framework/common/servicedef/services_geo.xml                      | 2 +-
 framework/common/servicedef/services_method.xml                   | 2 +-
 framework/common/servicedef/services_qrcode.xml                   | 2 +-
 framework/common/servicedef/services_security.xml                 | 2 +-
 framework/common/servicedef/services_test.xml                     | 2 +-
 framework/common/servicedef/smcas_test.xml                        | 2 +-
 framework/common/testdef/PerformFindTests.xml                     | 2 +-
 framework/common/testdef/UserLoginTests.xml                       | 2 +-
 framework/component-load.xml                                      | 2 +-
 framework/datafile/ofbiz-component.xml                            | 2 +-
 framework/documents/DataFiles.xml                                 | 8 ++++----
 framework/documents/UnitTest.xml                                  | 2 +-
 framework/entity/config/entityengine.xml                          | 2 +-
 framework/entity/entitydef/entitygroup.xml                        | 2 +-
 framework/entity/entitydef/entitymodel.xml                        | 2 +-
 framework/entity/entitydef/entitymodel_test.xml                   | 2 +-
 framework/entity/fieldtype/fieldtypeadvantage.xml                 | 2 +-
 framework/entity/fieldtype/fieldtypeaxion.xml                     | 2 +-
 framework/entity/fieldtype/fieldtypedaffodil.xml                  | 2 +-
 framework/entity/fieldtype/fieldtypederby.xml                     | 2 +-
 framework/entity/fieldtype/fieldtypefirebird.xml                  | 2 +-
 framework/entity/fieldtype/fieldtypehsql.xml                      | 2 +-
 framework/entity/fieldtype/fieldtypemssql.xml                     | 2 +-
 framework/entity/fieldtype/fieldtypemysql.xml                     | 2 +-
 framework/entity/fieldtype/fieldtypeoracle.xml                    | 2 +-
 framework/entity/fieldtype/fieldtypepostgres.xml                  | 2 +-
 framework/entity/fieldtype/fieldtypesapdb.xml                     | 2 +-
 framework/entity/fieldtype/fieldtypesybase.xml                    | 2 +-
 framework/entity/ofbiz-component.xml                              | 2 +-
 framework/entity/testdef/entitytests.xml                          | 2 +-
 framework/entityext/config/EntityExtUiLabels.xml                  | 2 +-
 framework/entityext/entitydef/entitymodel.xml                     | 2 +-
 framework/entityext/ofbiz-component.xml                           | 2 +-
 framework/entityext/servicedef/groups.xml                         | 2 +-
 framework/entityext/servicedef/secas.xml                          | 2 +-
 framework/entityext/servicedef/services.xml                       | 2 +-
 framework/entityext/servicedef/services_group.xml                 | 2 +-
 framework/entityext/servicedef/services_synchronization.xml       | 2 +-
 framework/entityext/servicedef/services_tenant.xml                | 2 +-
 framework/minilang/config/DefaultMessagesUiLabels.xml             | 2 +-
 framework/minilang/config/MiniLangErrorUiLabels.xml               | 2 +-
 framework/minilang/ofbiz-component.xml                            | 2 +-
 framework/minilang/testdef/MinilangTests.xml                      | 2 +-
 framework/resources/templates/Tests.xml                           | 2 +-
 framework/resources/templates/UiLabels.xml                        | 2 +-
 framework/resources/templates/entitymodel.xml                     | 2 +-
 framework/resources/templates/ofbiz-component.xml                 | 2 +-
 framework/resources/templates/services.xml                        | 2 +-
 framework/security/config/SecurityEntityLabels.xml                | 2 +-
 framework/security/entitydef/entitymodel.xml                      | 2 +-
 framework/security/ofbiz-component.xml                            | 2 +-
 framework/service/config/ServiceErrorUiLabels.xml                 | 2 +-
 framework/service/config/ServiceUiLabels.xml                      | 2 +-
 framework/service/config/serviceengine.xml                        | 2 +-
 framework/service/entitydef/entitymodel.xml                       | 2 +-
 framework/service/ofbiz-component.xml                             | 2 +-
 framework/service/servicedef/secas_test_se.xml                    | 2 +-
 framework/service/servicedef/services.xml                         | 2 +-
 framework/service/servicedef/services_test_se.xml                 | 2 +-
 framework/service/testdef/servicetests.xml                        | 2 +-
 framework/testtools/ofbiz-component.xml                           | 2 +-
 framework/testtools/servicedef/services.xml                       | 2 +-
 framework/webapp/config/WebappEntityLabels.xml                    | 2 +-
 framework/webapp/config/WebappUiLabels.xml                        | 2 +-
 framework/webapp/entitydef/entitygroup.xml                        | 2 +-
 framework/webapp/entitydef/entitymodel.xml                        | 2 +-
 framework/webapp/ofbiz-component.xml                              | 2 +-
 framework/webapp/testdef/webapptests.xml                          | 2 +-
 framework/webtools/config/WebtoolsErrorUiLabels.xml               | 2 +-
 framework/webtools/config/WebtoolsUiLabels.xml                    | 2 +-
 framework/webtools/ofbiz-component.xml                            | 2 +-
 framework/webtools/servicedef/services.xml                        | 2 +-
 framework/widget/config/conditionalUiLabels.xml                   | 2 +-
 framework/widget/ofbiz-component.xml                              | 2 +-
 framework/widget/testdef/widgettests.xml                          | 2 +-
 themes/bluelight/ofbiz-component.xml                              | 2 +-
 themes/common/config/CommonThemeUiLabels.xml                      | 2 +-
 themes/common/ofbiz-component.xml                                 | 2 +-
 themes/flatgrey/ofbiz-component.xml                               | 2 +-
 themes/rainbowstone/ofbiz-component.xml                           | 2 +-
 themes/tomahawk/ofbiz-component.xml                               | 2 +-
 307 files changed, 310 insertions(+), 310 deletions(-)

diff --git a/applications/accounting/config/AccountingEntityLabels.xml b/applications/accounting/config/AccountingEntityLabels.xml
index 9dfb49f..07b8217 100644
--- a/applications/accounting/config/AccountingEntityLabels.xml
+++ b/applications/accounting/config/AccountingEntityLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="AcctgTransType.description.AMORTIZATION">
         <value xml:lang="ar">الإطفاء</value>
         <value xml:lang="de">Amortisation</value>
diff --git a/applications/accounting/config/AccountingErrorUiLabels.xml b/applications/accounting/config/AccountingErrorUiLabels.xml
index 687900e..3013164 100644
--- a/applications/accounting/config/AccountingErrorUiLabels.xml
+++ b/applications/accounting/config/AccountingErrorUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="AccountingCheckAccountCannotBeUpdated">
         <value xml:lang="en">ERROR: Could not update Check Account.</value>
     </property>
diff --git a/applications/accounting/config/AccountingUiLabels.xml b/applications/accounting/config/AccountingUiLabels.xml
index e7762ac..274b4b5 100644
--- a/applications/accounting/config/AccountingUiLabels.xml
+++ b/applications/accounting/config/AccountingUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="AccountingAccount">
         <value xml:lang="ar">حساب</value>
         <value xml:lang="cs">Účet</value>
diff --git a/applications/accounting/entitydef/eecas.xml b/applications/accounting/entitydef/eecas.xml
index 333da09..b258470 100644
--- a/applications/accounting/entitydef/eecas.xml
+++ b/applications/accounting/entitydef/eecas.xml
@@ -19,7 +19,7 @@
   -->
 
 <entity-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entity-eca.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entity-eca.xsd">
 
     <!-- To maintain FinAccount.actualBalance and FinAccount.availableBalance -->
     <eca entity="FinAccountTrans" operation="create-store" event="return">
diff --git a/applications/accounting/entitydef/entitymodel_reports.xml b/applications/accounting/entitydef/entitymodel_reports.xml
index 8cadef8..a22a7e9 100644
--- a/applications/accounting/entitydef/entitymodel_reports.xml
+++ b/applications/accounting/entitydef/entitymodel_reports.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
     <!-- ========================================================= -->
     <!-- ======================== Defaults ======================= -->
     <!-- ========================================================= -->
diff --git a/applications/accounting/ofbiz-component.xml b/applications/accounting/ofbiz-component.xml
index e63f527..052eb0d 100644
--- a/applications/accounting/ofbiz-component.xml
+++ b/applications/accounting/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="accounting"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
 
diff --git a/applications/accounting/servicedef/groups.xml b/applications/accounting/servicedef/groups.xml
index 4b27541..e5c3c3c 100644
--- a/applications/accounting/servicedef/groups.xml
+++ b/applications/accounting/servicedef/groups.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-group xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-group.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-group.xsd">
 
     <group name="createCreditCardAndAddress" send-mode="all">
         <invoke name="createPostalAddress" mode="sync" result-to-context="true"/>
diff --git a/applications/accounting/servicedef/secas.xml b/applications/accounting/servicedef/secas.xml
index cfe8382..5ce50b3 100644
--- a/applications/accounting/servicedef/secas.xml
+++ b/applications/accounting/servicedef/secas.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
 
     <eca service="createPaymentApplication" event="commit">
         <condition field-name="invoiceId" operator="is-not-empty"/>
diff --git a/applications/accounting/servicedef/secas_invoice.xml b/applications/accounting/servicedef/secas_invoice.xml
index 0bb63ff..740caa3 100644
--- a/applications/accounting/servicedef/secas_invoice.xml
+++ b/applications/accounting/servicedef/secas_invoice.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
 
     <!-- On cancelling invoice reverse its Accounting Transactions -->
     <eca service="cancelInvoice" event="invoke">
diff --git a/applications/accounting/servicedef/secas_ledger.xml b/applications/accounting/servicedef/secas_ledger.xml
index 920d9c4..05a8eaf 100644
--- a/applications/accounting/servicedef/secas_ledger.xml
+++ b/applications/accounting/servicedef/secas_ledger.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
 
     <!-- this eca automatically posts the accounting transactions to GL -->
     <eca service="createAcctgTransAndEntries" event="commit">
diff --git a/applications/accounting/servicedef/secas_payment.xml b/applications/accounting/servicedef/secas_payment.xml
index c82be64..706d8b5 100644
--- a/applications/accounting/servicedef/secas_payment.xml
+++ b/applications/accounting/servicedef/secas_payment.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
 
 <!-- these SECAs are for automatically creating accounting transactions based on business transactions.
      They should normally be "sync" SECAs so that they happen as soon
diff --git a/applications/accounting/servicedef/services_admin.xml b/applications/accounting/servicedef/services_admin.xml
index 1eb4cfa..39e9c36 100644
--- a/applications/accounting/servicedef/services_admin.xml
+++ b/applications/accounting/servicedef/services_admin.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Services - Miscellaneous</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_agreement.xml b/applications/accounting/servicedef/services_agreement.xml
index 545014a..df335ab 100644
--- a/applications/accounting/servicedef/services_agreement.xml
+++ b/applications/accounting/servicedef/services_agreement.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Services: Agreements </description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_authorizedotnet.xml b/applications/accounting/servicedef/services_authorizedotnet.xml
index 0156fec..767a416 100644
--- a/applications/accounting/servicedef/services_authorizedotnet.xml
+++ b/applications/accounting/servicedef/services_authorizedotnet.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_billing.xml b/applications/accounting/servicedef/services_billing.xml
index ae4005a..60687ae 100644
--- a/applications/accounting/servicedef/services_billing.xml
+++ b/applications/accounting/servicedef/services_billing.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_budget.xml b/applications/accounting/servicedef/services_budget.xml
index 6f210b0..39e3ba3 100644
--- a/applications/accounting/servicedef/services_budget.xml
+++ b/applications/accounting/servicedef/services_budget.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Services: Budget</description>
     <vendor>Apache OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_clearcommerce.xml b/applications/accounting/servicedef/services_clearcommerce.xml
index c42da62..41e2f3c 100644
--- a/applications/accounting/servicedef/services_clearcommerce.xml
+++ b/applications/accounting/servicedef/services_clearcommerce.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Clear Commerce Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_cost.xml b/applications/accounting/servicedef/services_cost.xml
index 00ba413..c3194d4 100644
--- a/applications/accounting/servicedef/services_cost.xml
+++ b/applications/accounting/servicedef/services_cost.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Cost Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_cybersource.xml b/applications/accounting/servicedef/services_cybersource.xml
index 51e297e..aa75c2c 100644
--- a/applications/accounting/servicedef/services_cybersource.xml
+++ b/applications/accounting/servicedef/services_cybersource.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_finaccount.xml b/applications/accounting/servicedef/services_finaccount.xml
index f4c823c..f357bc3 100644
--- a/applications/accounting/servicedef/services_finaccount.xml
+++ b/applications/accounting/servicedef/services_finaccount.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Services: Financial Account</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_fixedasset.xml b/applications/accounting/servicedef/services_fixedasset.xml
index 47bdf2a..9bea34f 100644
--- a/applications/accounting/servicedef/services_fixedasset.xml
+++ b/applications/accounting/servicedef/services_fixedasset.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Services: Fixed Asset </description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_invoice.xml b/applications/accounting/servicedef/services_invoice.xml
index 5a55b91..0fdb506 100644
--- a/applications/accounting/servicedef/services_invoice.xml
+++ b/applications/accounting/servicedef/services_invoice.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_ledger.xml b/applications/accounting/servicedef/services_ledger.xml
index db202a1..47be8f2 100644
--- a/applications/accounting/servicedef/services_ledger.xml
+++ b/applications/accounting/servicedef/services_ledger.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_orbital.xml b/applications/accounting/servicedef/services_orbital.xml
index 36189cc..863d45f 100644
--- a/applications/accounting/servicedef/services_orbital.xml
+++ b/applications/accounting/servicedef/services_orbital.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>OrbitalGateway Services</description>
     <vendor></vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_payment.xml b/applications/accounting/servicedef/services_payment.xml
index f96eb37..5f5f5f8 100644
--- a/applications/accounting/servicedef/services_payment.xml
+++ b/applications/accounting/servicedef/services_payment.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_paymentgateway.xml b/applications/accounting/servicedef/services_paymentgateway.xml
index 9d7038a..1778c72 100644
--- a/applications/accounting/servicedef/services_paymentgateway.xml
+++ b/applications/accounting/servicedef/services_paymentgateway.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Payment Gateway Config Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_paymentmethod.xml b/applications/accounting/servicedef/services_paymentmethod.xml
index c0ad592..b65cc40 100644
--- a/applications/accounting/servicedef/services_paymentmethod.xml
+++ b/applications/accounting/servicedef/services_paymentmethod.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_paypal.xml b/applications/accounting/servicedef/services_paypal.xml
index 8bef399..4e4c548 100644
--- a/applications/accounting/servicedef/services_paypal.xml
+++ b/applications/accounting/servicedef/services_paypal.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>PayPal Services</description>
 
     <service name="payPalSetExpressCheckout" engine="java"
diff --git a/applications/accounting/servicedef/services_pccharge.xml b/applications/accounting/servicedef/services_pccharge.xml
index abf97dd..c84cdeb 100644
--- a/applications/accounting/servicedef/services_pccharge.xml
+++ b/applications/accounting/servicedef/services_pccharge.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_perm.xml b/applications/accounting/servicedef/services_perm.xml
index 592a599..b632c45 100644
--- a/applications/accounting/servicedef/services_perm.xml
+++ b/applications/accounting/servicedef/services_perm.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Permission Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_rate.xml b/applications/accounting/servicedef/services_rate.xml
index 7bfeacd..5154e13 100644
--- a/applications/accounting/servicedef/services_rate.xml
+++ b/applications/accounting/servicedef/services_rate.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Services: Rate and related services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_rita.xml b/applications/accounting/servicedef/services_rita.xml
index 970d893..afe6cbb 100644
--- a/applications/accounting/servicedef/services_rita.xml
+++ b/applications/accounting/servicedef/services_rita.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_sagepay.xml b/applications/accounting/servicedef/services_sagepay.xml
index 6d6ab12..d1a7adb 100644
--- a/applications/accounting/servicedef/services_sagepay.xml
+++ b/applications/accounting/servicedef/services_sagepay.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_securepay.xml b/applications/accounting/servicedef/services_securepay.xml
index 15e4dad..abba2af 100644
--- a/applications/accounting/servicedef/services_securepay.xml
+++ b/applications/accounting/servicedef/services_securepay.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_tax.xml b/applications/accounting/servicedef/services_tax.xml
index c30484b..2718357 100644
--- a/applications/accounting/servicedef/services_tax.xml
+++ b/applications/accounting/servicedef/services_tax.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Services: TaxAuthority and related </description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_valuelink.xml b/applications/accounting/servicedef/services_valuelink.xml
index c3f84f5..655e59e 100644
--- a/applications/accounting/servicedef/services_valuelink.xml
+++ b/applications/accounting/servicedef/services_valuelink.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/servicedef/services_verisign.xml b/applications/accounting/servicedef/services_verisign.xml
index cda66ad..0c1b6e2 100644
--- a/applications/accounting/servicedef/services_verisign.xml
+++ b/applications/accounting/servicedef/services_verisign.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/accounting/testdef/accountingtests.xml b/applications/accounting/testdef/accountingtests.xml
index 2dda07a..9525d4d 100644
--- a/applications/accounting/testdef/accountingtests.xml
+++ b/applications/accounting/testdef/accountingtests.xml
@@ -20,7 +20,7 @@
 
 <test-suite suite-name="accountingtests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-case case-name="accounting-tests-data-load">
         <entity-xml action="load" entity-xml-url="component://accounting/testdef/data/AccountingTestsData.xml"/>
diff --git a/applications/accounting/testdef/fixedassettests.xml b/applications/accounting/testdef/fixedassettests.xml
index 99fb04c..74ffaf8 100644
--- a/applications/accounting/testdef/fixedassettests.xml
+++ b/applications/accounting/testdef/fixedassettests.xml
@@ -20,7 +20,7 @@
 
 <test-suite suite-name="fixedassettests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-case case-name="fixedasset-tests">
         <simple-method-test location="component://accounting/minilang/test/FixedAssetTests.xml"/>
diff --git a/applications/accounting/testdef/invoicetests.xml b/applications/accounting/testdef/invoicetests.xml
index 39c3723..5ced709 100644
--- a/applications/accounting/testdef/invoicetests.xml
+++ b/applications/accounting/testdef/invoicetests.xml
@@ -20,7 +20,7 @@
 
 <test-suite suite-name="invoicetests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-case case-name="auto-invoice-tests">
         <simple-method-test location="component://accounting/minilang/test/AutoInvoiceTests.xml"/>
diff --git a/applications/accounting/testdef/paymentappltests.xml b/applications/accounting/testdef/paymentappltests.xml
index 434c245..5ee6bc7 100644
--- a/applications/accounting/testdef/paymentappltests.xml
+++ b/applications/accounting/testdef/paymentappltests.xml
@@ -20,7 +20,7 @@
 
 <test-suite suite-name="paymentappltests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-case case-name="application-tests-data-load">
         <entity-xml action="load" entity-xml-url="component://accounting/testdef/data/PaymentApplicationTestsData.xml"/>
diff --git a/applications/accounting/testdef/paymenttests.xml b/applications/accounting/testdef/paymenttests.xml
index deeef6c..5d073a8 100644
--- a/applications/accounting/testdef/paymenttests.xml
+++ b/applications/accounting/testdef/paymenttests.xml
@@ -20,7 +20,7 @@
 
 <test-suite suite-name="paymenttests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-case case-name="auto-payment-tests">
         <simple-method-test location="component://accounting/minilang/test/AutoPaymentTests.xml"/>
diff --git a/applications/accounting/testdef/ratetests.xml b/applications/accounting/testdef/ratetests.xml
index 21629a7..e68ff12 100644
--- a/applications/accounting/testdef/ratetests.xml
+++ b/applications/accounting/testdef/ratetests.xml
@@ -20,7 +20,7 @@
 
 <test-suite suite-name="ratetests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
     <test-case case-name="rate-tests-data-load">
         <entity-xml action="load" entity-xml-url="component://accounting/testdef/data/RateTestsData.xml"/>
     </test-case>
diff --git a/applications/commonext/config/CommonExtUiLabels.xml b/applications/commonext/config/CommonExtUiLabels.xml
index 4dca5c3..6e2aee9 100644
--- a/applications/commonext/config/CommonExtUiLabels.xml
+++ b/applications/commonext/config/CommonExtUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="CommonExtCreatePublicMessage">
         <value xml:lang="de">Erzeuge öffentliche Nachricht</value>
         <value xml:lang="en">Create Public Message</value>
diff --git a/applications/commonext/config/SetupUiLabels.xml b/applications/commonext/config/SetupUiLabels.xml
index ab6ead4..b4b4dd0 100644
--- a/applications/commonext/config/SetupUiLabels.xml
+++ b/applications/commonext/config/SetupUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="PageTitleEditProductCategory">
         <value xml:lang="en">Edit Product Category</value>
         <value xml:lang="fr">Edition de la catégorie produit</value>
diff --git a/applications/commonext/entitydef/entitymodel.xml b/applications/commonext/entitydef/entitymodel.xml
index 5c39c0e..faa2118 100644
--- a/applications/commonext/entitydef/entitymodel.xml
+++ b/applications/commonext/entitydef/entitymodel.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
     <title>Entity of an Apache OFBiz Component</title>
     <description>None</description>
     <version>1.0</version>
diff --git a/applications/commonext/ofbiz-component.xml b/applications/commonext/ofbiz-component.xml
index da05a61..49e249a 100644
--- a/applications/commonext/ofbiz-component.xml
+++ b/applications/commonext/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="commonext"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
     
diff --git a/applications/commonext/servicedef/secas.xml b/applications/commonext/servicedef/secas.xml
index 11dcb66..64b0a0f 100644
--- a/applications/commonext/servicedef/secas.xml
+++ b/applications/commonext/servicedef/secas.xml
@@ -19,6 +19,6 @@ under the License.
 -->
 
 <service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
         
 </service-eca>
diff --git a/applications/commonext/servicedef/services.xml b/applications/commonext/servicedef/services.xml
index 4dfe02f..85dad3b 100644
--- a/applications/commonext/servicedef/services.xml
+++ b/applications/commonext/servicedef/services.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Commonext Component Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/component-load.xml b/applications/component-load.xml
index 7d2a71a..283292d 100644
--- a/applications/component-load.xml
+++ b/applications/component-load.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <component-loader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/component-loader.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/component-loader.xsd">
     <load-component component-location="datamodel"/>
     <load-component component-location="party"/>
     <load-component component-location="securityext"/>
diff --git a/applications/content/config/ContentEntityLabels.xml b/applications/content/config/ContentEntityLabels.xml
index 3ddbd6b..b9e1f6e 100644
--- a/applications/content/config/ContentEntityLabels.xml
+++ b/applications/content/config/ContentEntityLabels.xml
@@ -17,7 +17,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="CharacterSet.description.ISO-8859-1">
         <value xml:lang="en">ISO-8859-1</value>
         <value xml:lang="es">ISO-8859-1 Inglés</value>
diff --git a/applications/content/config/ContentErrorUiLabels.xml b/applications/content/config/ContentErrorUiLabels.xml
index 761907e..abe6af4 100644
--- a/applications/content/config/ContentErrorUiLabels.xml
+++ b/applications/content/config/ContentErrorUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="contentevents.error_getting_content_list">
         <value xml:lang="en">Error getting the content list to index: ${gee}.</value>
         <value xml:lang="ja">コンテンツリストの取得時にエラー。索引: ${gee}.</value>
diff --git a/applications/content/config/ContentUiLabels.xml b/applications/content/config/ContentUiLabels.xml
index 8e1ce5d..04b8377 100644
--- a/applications/content/config/ContentUiLabels.xml
+++ b/applications/content/config/ContentUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="CannotFindCmsform">
         <value xml:lang="de">Die CMS Form kann nicht gefunden werden!</value>
         <value xml:lang="en">Cannot find the cmsform!</value>
diff --git a/applications/content/entitydef/eecas.xml b/applications/content/entitydef/eecas.xml
index 135f0b2..62cabbf 100644
--- a/applications/content/entitydef/eecas.xml
+++ b/applications/content/entitydef/eecas.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entity-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entity-eca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entity-eca.xsd">
 
     <!-- If the text in the database has changed for the data resource, we need to clear out anything depending on this cached value -->
     <eca entity="ElectronicText" operation="store-remove" event="return">
diff --git a/applications/content/ofbiz-component.xml b/applications/content/ofbiz-component.xml
index 7d36cc4..c3a749c 100644
--- a/applications/content/ofbiz-component.xml
+++ b/applications/content/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="content"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
     <classpath type="dir" location="dtd"/>
diff --git a/applications/content/servicedef/mca.xml b/applications/content/servicedef/mca.xml
index d5abd79..2e09732 100644
--- a/applications/content/servicedef/mca.xml
+++ b/applications/content/servicedef/mca.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-mca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-mca.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-mca.xsd">
 
     <mca mail-rule-name="processIncomingEmail">
         <action service="storeIncomingEmail" mode="sync"/>
diff --git a/applications/content/servicedef/secas.xml b/applications/content/servicedef/secas.xml
index 0dd6edb..ea13e34 100644
--- a/applications/content/servicedef/secas.xml
+++ b/applications/content/servicedef/secas.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
     <eca service="createFile" event="in-validate">
         <condition field-name="dataResource" operator="is-empty"/>
         <action service="createDataResource" mode="sync"/>
diff --git a/applications/content/servicedef/services.xml b/applications/content/servicedef/services.xml
index 53f75f6..20c4a33 100644
--- a/applications/content/servicedef/services.xml
+++ b/applications/content/servicedef/services.xml
@@ -19,7 +19,7 @@
   -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Content Component Services</description>
     <vendor>OFBiz</vendor>
 
diff --git a/applications/content/servicedef/services_commevent.xml b/applications/content/servicedef/services_commevent.xml
index c440004..57ea96c 100644
--- a/applications/content/servicedef/services_commevent.xml
+++ b/applications/content/servicedef/services_commevent.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Content Component Services</description>
     <vendor>OFBiz</vendor>
 
diff --git a/applications/content/servicedef/services_content.xml b/applications/content/servicedef/services_content.xml
index 5b35948..0f028a7 100644
--- a/applications/content/servicedef/services_content.xml
+++ b/applications/content/servicedef/services_content.xml
@@ -18,7 +18,7 @@
   -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Content Component Content Services</description>
     <vendor>OFBiz</vendor>
 
diff --git a/applications/content/servicedef/services_contenttypes.xml b/applications/content/servicedef/services_contenttypes.xml
index 0f45f5b..e701391 100644
--- a/applications/content/servicedef/services_contenttypes.xml
+++ b/applications/content/servicedef/services_contenttypes.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Content Component Services</description>
     <vendor>OFBiz</vendor>
 
diff --git a/applications/content/servicedef/services_data.xml b/applications/content/servicedef/services_data.xml
index 4625253..ce19fec 100644
--- a/applications/content/servicedef/services_data.xml
+++ b/applications/content/servicedef/services_data.xml
@@ -18,7 +18,7 @@
   -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Content Component Data Services</description>
     <vendor>OFBiz</vendor>
 
diff --git a/applications/content/servicedef/services_document.xml b/applications/content/servicedef/services_document.xml
index 0efa49c..8830ea4 100644
--- a/applications/content/servicedef/services_document.xml
+++ b/applications/content/servicedef/services_document.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Content Component Document Services</description>
     <vendor>OFBiz</vendor>
 
diff --git a/applications/content/servicedef/services_output.xml b/applications/content/servicedef/services_output.xml
index 0c7ff8a..1e5dccd 100644
--- a/applications/content/servicedef/services_output.xml
+++ b/applications/content/servicedef/services_output.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Content Component Output Services</description>
     <vendor>OFBiz</vendor>
 
diff --git a/applications/content/servicedef/services_survey.xml b/applications/content/servicedef/services_survey.xml
index 53478b5..3138859 100644
--- a/applications/content/servicedef/services_survey.xml
+++ b/applications/content/servicedef/services_survey.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Content Component Services</description>
     <vendor>OFBiz</vendor>
 
diff --git a/applications/content/servicedef/services_website.xml b/applications/content/servicedef/services_website.xml
index b67a702..3c991f5 100644
--- a/applications/content/servicedef/services_website.xml
+++ b/applications/content/servicedef/services_website.xml
@@ -18,7 +18,7 @@
   -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Content Component WebSite Services</description>
     <vendor>OFBiz</vendor>
 
diff --git a/applications/datamodel/entitydef/accounting-entitymodel.xml b/applications/datamodel/entitydef/accounting-entitymodel.xml
index bcd106d..b66d2e2 100644
--- a/applications/datamodel/entitydef/accounting-entitymodel.xml
+++ b/applications/datamodel/entitydef/accounting-entitymodel.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
     <!-- ========================================================= -->
     <!-- ======================== Defaults ======================= -->
     <!-- ========================================================= -->
diff --git a/applications/datamodel/entitydef/content-entitymodel.xml b/applications/datamodel/entitydef/content-entitymodel.xml
index 5efe2d5..78245c4 100644
--- a/applications/datamodel/entitydef/content-entitymodel.xml
+++ b/applications/datamodel/entitydef/content-entitymodel.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
   <!-- ========================================================= -->
   <!-- ======================== Defaults ======================= -->
   <!-- ========================================================= -->
diff --git a/applications/datamodel/entitydef/humanres-entitymodel.xml b/applications/datamodel/entitydef/humanres-entitymodel.xml
index 7a92d91..aba3eb4 100644
--- a/applications/datamodel/entitydef/humanres-entitymodel.xml
+++ b/applications/datamodel/entitydef/humanres-entitymodel.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
   <!-- ========================================================= -->
   <!-- ======================== Defaults ======================= -->
   <!-- ========================================================= -->
diff --git a/applications/datamodel/entitydef/manufacturing-entitymodel.xml b/applications/datamodel/entitydef/manufacturing-entitymodel.xml
index 9941e16..ccbfaa3 100644
--- a/applications/datamodel/entitydef/manufacturing-entitymodel.xml
+++ b/applications/datamodel/entitydef/manufacturing-entitymodel.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
   <!-- ========================================================= -->
   <!-- ======================== Defaults ======================= -->
   <!-- ========================================================= -->
diff --git a/applications/datamodel/entitydef/marketing-entitymodel.xml b/applications/datamodel/entitydef/marketing-entitymodel.xml
index 96c532b..af0e99c 100644
--- a/applications/datamodel/entitydef/marketing-entitymodel.xml
+++ b/applications/datamodel/entitydef/marketing-entitymodel.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+             xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
     <!-- ========================================================= -->
     <!-- ======================== Defaults ======================= -->
     <!-- ========================================================= -->
diff --git a/applications/datamodel/entitydef/order-entitymodel.xml b/applications/datamodel/entitydef/order-entitymodel.xml
index bdfeb6b..bdd1ee4 100644
--- a/applications/datamodel/entitydef/order-entitymodel.xml
+++ b/applications/datamodel/entitydef/order-entitymodel.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
   <!-- ========================================================= -->
   <!-- ======================== Defaults ======================= -->
   <!-- ========================================================= -->
diff --git a/applications/datamodel/entitydef/party-entitymodel.xml b/applications/datamodel/entitydef/party-entitymodel.xml
index 8f99025..3e728a9 100644
--- a/applications/datamodel/entitydef/party-entitymodel.xml
+++ b/applications/datamodel/entitydef/party-entitymodel.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
   <!-- ========================================================= -->
   <!-- ======================== Defaults ======================= -->
   <!-- ========================================================= -->
diff --git a/applications/datamodel/entitydef/product-entitymodel.xml b/applications/datamodel/entitydef/product-entitymodel.xml
index 7c795d6..35185ca 100644
--- a/applications/datamodel/entitydef/product-entitymodel.xml
+++ b/applications/datamodel/entitydef/product-entitymodel.xml
@@ -18,7 +18,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
     <!-- ========================================================= -->
     <!-- ======================== Defaults ======================= -->
     <!-- ========================================================= -->
diff --git a/applications/datamodel/entitydef/shipment-entitymodel.xml b/applications/datamodel/entitydef/shipment-entitymodel.xml
index 9774688..a486631 100644
--- a/applications/datamodel/entitydef/shipment-entitymodel.xml
+++ b/applications/datamodel/entitydef/shipment-entitymodel.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
   <!-- ========================================================= -->
   <!-- ======================== Defaults ======================= -->
   <!-- ========================================================= -->
diff --git a/applications/datamodel/entitydef/workeffort-entitymodel.xml b/applications/datamodel/entitydef/workeffort-entitymodel.xml
index bad5c0b..5e0bbfb 100644
--- a/applications/datamodel/entitydef/workeffort-entitymodel.xml
+++ b/applications/datamodel/entitydef/workeffort-entitymodel.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
   <!-- ========================================================= -->
   <!-- ======================== Defaults ======================= -->
   <!-- ========================================================= -->
diff --git a/applications/datamodel/ofbiz-component.xml b/applications/datamodel/ofbiz-component.xml
index 1710cf8..d3bf992 100644
--- a/applications/datamodel/ofbiz-component.xml
+++ b/applications/datamodel/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="datamodel"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
 
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/accounting-entitymodel.xml"/>
diff --git a/applications/humanres/config/HumanResEntityLabels.xml b/applications/humanres/config/HumanResEntityLabels.xml
index ba9f464..25b4d8d 100644
--- a/applications/humanres/config/HumanResEntityLabels.xml
+++ b/applications/humanres/config/HumanResEntityLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="EmplLeaveReasonType.description.CASUAL">
         <value xml:lang="en">Casual</value>
         <value xml:lang="fr">Convenance</value>
diff --git a/applications/humanres/config/HumanResErrorUiLabels.xml b/applications/humanres/config/HumanResErrorUiLabels.xml
index 3f18653..cfad2de 100644
--- a/applications/humanres/config/HumanResErrorUiLabels.xml
+++ b/applications/humanres/config/HumanResErrorUiLabels.xml
@@ -19,7 +19,7 @@
     under the License.
 -->
 
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="HumanResRequiredFieldMissingTrainingClassTypeId">
         <value xml:lang="en">Required Field Missing : Training Class Type Id.</value>
     </property>
diff --git a/applications/humanres/config/HumanResUiLabels.xml b/applications/humanres/config/HumanResUiLabels.xml
index e23f4b2..8d17a07 100644
--- a/applications/humanres/config/HumanResUiLabels.xml
+++ b/applications/humanres/config/HumanResUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="FormFieldTitle_accountNumber">
         <value xml:lang="en">Account Number</value>
         <value xml:lang="de">Kontonummer</value>
diff --git a/applications/humanres/ofbiz-component.xml b/applications/humanres/ofbiz-component.xml
index 2f62d75..ba85e2a 100644
--- a/applications/humanres/ofbiz-component.xml
+++ b/applications/humanres/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="humanres"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
 
diff --git a/applications/humanres/servicedef/services.xml b/applications/humanres/servicedef/services.xml
index 08a3f69..63dc61c 100644
--- a/applications/humanres/servicedef/services.xml
+++ b/applications/humanres/servicedef/services.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Human Resources Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/humanres/servicedef/services_ability.xml b/applications/humanres/servicedef/services_ability.xml
index ab69505..3ba4f85 100644
--- a/applications/humanres/servicedef/services_ability.xml
+++ b/applications/humanres/servicedef/services_ability.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+          xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Human Resources Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/humanres/servicedef/services_employment.xml b/applications/humanres/servicedef/services_employment.xml
index 66a1288..3e07752 100644
--- a/applications/humanres/servicedef/services_employment.xml
+++ b/applications/humanres/servicedef/services_employment.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Humanres Services</description>
     <vendor>OFBiz</vendor>
 
diff --git a/applications/humanres/servicedef/services_position.xml b/applications/humanres/servicedef/services_position.xml
index 0d637e3..a0b5b77 100644
--- a/applications/humanres/servicedef/services_position.xml
+++ b/applications/humanres/servicedef/services_position.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Humanres Services</description>
     <vendor>OFBiz</vendor>
 
diff --git a/applications/manufacturing/config/ManufacturingEntityLabels.xml b/applications/manufacturing/config/ManufacturingEntityLabels.xml
index 2d381c1..9b9e89e 100644
--- a/applications/manufacturing/config/ManufacturingEntityLabels.xml
+++ b/applications/manufacturing/config/ManufacturingEntityLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="MrpEventType.description.MANUF_ORDER_RECP">
         <value xml:lang="en">Manufacturing Order receipt</value>
         <value xml:lang="es">Recibo de Orden de Producción</value>
diff --git a/applications/manufacturing/config/ManufacturingReportsUiLabels.xml b/applications/manufacturing/config/ManufacturingReportsUiLabels.xml
index f7ec82d..ce88852 100644
--- a/applications/manufacturing/config/ManufacturingReportsUiLabels.xml
+++ b/applications/manufacturing/config/ManufacturingReportsUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="ManufacturingCompletionDate">
         <value xml:lang="en">Completion Date</value>
         <value xml:lang="es">Fecha de Términación</value>
diff --git a/applications/manufacturing/config/ManufacturingUiLabels.xml b/applications/manufacturing/config/ManufacturingUiLabels.xml
index 11fcb06..b445886 100644
--- a/applications/manufacturing/config/ManufacturingUiLabels.xml
+++ b/applications/manufacturing/config/ManufacturingUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="AddParty">
         <value xml:lang="en">Add Party</value>
         <value xml:lang="nl">Partij toevoegen</value>
diff --git a/applications/manufacturing/ofbiz-component.xml b/applications/manufacturing/ofbiz-component.xml
index 30a11e8..4fdc52c 100644
--- a/applications/manufacturing/ofbiz-component.xml
+++ b/applications/manufacturing/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="manufacturing"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
 
     <!-- place the config directory on the classpath to access configuration files -->
diff --git a/applications/manufacturing/servicedef/secas.xml b/applications/manufacturing/servicedef/secas.xml
index e16be48..ad35670 100644
--- a/applications/manufacturing/servicedef/secas.xml
+++ b/applications/manufacturing/servicedef/secas.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
     <eca service="updateRequirement" event="commit">
         <condition field-name="requirementTypeId" operator="equals" value="INTERNAL_REQUIREMENT"/>
         <condition field-name="statusId" operator="equals" value="REQ_APPROVED"/>
diff --git a/applications/manufacturing/servicedef/services.xml b/applications/manufacturing/servicedef/services.xml
index 693b286..55ec905 100644
--- a/applications/manufacturing/servicedef/services.xml
+++ b/applications/manufacturing/servicedef/services.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Manufacturing Services - Misc</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/manufacturing/servicedef/services_bom.xml b/applications/manufacturing/servicedef/services_bom.xml
index 07a583c..b46afa4 100644
--- a/applications/manufacturing/servicedef/services_bom.xml
+++ b/applications/manufacturing/servicedef/services_bom.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Manufacturing Services - Bill Of Materials</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/manufacturing/servicedef/services_calendar.xml b/applications/manufacturing/servicedef/services_calendar.xml
index 9a6db9e..e189e92 100644
--- a/applications/manufacturing/servicedef/services_calendar.xml
+++ b/applications/manufacturing/servicedef/services_calendar.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Manufacturing Services - Calendar</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/manufacturing/servicedef/services_formula.xml b/applications/manufacturing/servicedef/services_formula.xml
index 252c6e2..de9123c 100644
--- a/applications/manufacturing/servicedef/services_formula.xml
+++ b/applications/manufacturing/servicedef/services_formula.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Manufacturing Services - Formula</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/manufacturing/servicedef/services_mrp.xml b/applications/manufacturing/servicedef/services_mrp.xml
index c17029e..d1df909 100644
--- a/applications/manufacturing/servicedef/services_mrp.xml
+++ b/applications/manufacturing/servicedef/services_mrp.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Manufacturing Services - MRP</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/manufacturing/servicedef/services_production_run.xml b/applications/manufacturing/servicedef/services_production_run.xml
index 3526091..fb181cb 100644
--- a/applications/manufacturing/servicedef/services_production_run.xml
+++ b/applications/manufacturing/servicedef/services_production_run.xml
@@ -18,7 +18,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Manufacturing Services - Production Run</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/manufacturing/servicedef/services_routing.xml b/applications/manufacturing/servicedef/services_routing.xml
index eb4332c..8b6d6a1 100644
--- a/applications/manufacturing/servicedef/services_routing.xml
+++ b/applications/manufacturing/servicedef/services_routing.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Manufacturing Services - Routing</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/manufacturing/testdef/productionruntests.xml b/applications/manufacturing/testdef/productionruntests.xml
index f4af1b2..ea0877d 100644
--- a/applications/manufacturing/testdef/productionruntests.xml
+++ b/applications/manufacturing/testdef/productionruntests.xml
@@ -20,7 +20,7 @@
 
 <test-suite suite-name="productionruntests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
     <test-case case-name="manufacturing-tests-data-load">
         <entity-xml action="load" entity-xml-url="component://manufacturing/testdef/data/ManufacturingTestsData.xml"/>
     </test-case>
diff --git a/applications/marketing/config/MarketingEntityLabels.xml b/applications/marketing/config/MarketingEntityLabels.xml
index 45ab1cb..ed49117 100644
--- a/applications/marketing/config/MarketingEntityLabels.xml
+++ b/applications/marketing/config/MarketingEntityLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="ContactListType.description.ANNOUNCEMENT">
         <value xml:lang="en">Announcement</value>
         <value xml:lang="es">Anuncio</value>
diff --git a/applications/marketing/config/MarketingUiLabels.xml b/applications/marketing/config/MarketingUiLabels.xml
index a0e04b8..26d2bd6 100644
--- a/applications/marketing/config/MarketingUiLabels.xml
+++ b/applications/marketing/config/MarketingUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="FormFieldTitle_actualCost">
         <value xml:lang="de">Ist-Kosten</value>
         <value xml:lang="en">Actual Cost</value>
diff --git a/applications/marketing/ofbiz-component.xml b/applications/marketing/ofbiz-component.xml
index 6d52a38..bfb61ef 100644
--- a/applications/marketing/ofbiz-component.xml
+++ b/applications/marketing/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="marketing"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
     
diff --git a/applications/marketing/servicedef/secas.xml b/applications/marketing/servicedef/secas.xml
index 7d42d63..a1918ce 100644
--- a/applications/marketing/servicedef/secas.xml
+++ b/applications/marketing/servicedef/secas.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
     <eca service="createContactListPartyStatus" event="commit">
         <condition field-name="statusId" operator="equals" value="CLPT_PENDING"/>
         <action service="sendContactListPartyVerifyEmail" mode="async" persist="true"/>
diff --git a/applications/marketing/servicedef/services.xml b/applications/marketing/servicedef/services.xml
index b31a13b..ed3c439 100644
--- a/applications/marketing/servicedef/services.xml
+++ b/applications/marketing/servicedef/services.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Marketing Component Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/marketing/servicedef/services_contact.xml b/applications/marketing/servicedef/services_contact.xml
index 27ad504..d6dd978 100644
--- a/applications/marketing/servicedef/services_contact.xml
+++ b/applications/marketing/servicedef/services_contact.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Order Contact Services</description>
     <vendor>OFBiz</vendor>
 
diff --git a/applications/marketing/servicedef/services_opportunity.xml b/applications/marketing/servicedef/services_opportunity.xml
index 73ce5ab..0a36375 100644
--- a/applications/marketing/servicedef/services_opportunity.xml
+++ b/applications/marketing/servicedef/services_opportunity.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Order Opportunity Services</description>
     <vendor>OFBiz</vendor>
 
diff --git a/applications/marketing/testdef/MarketingTests.xml b/applications/marketing/testdef/MarketingTests.xml
index 384a1fc..7cdb620 100644
--- a/applications/marketing/testdef/MarketingTests.xml
+++ b/applications/marketing/testdef/MarketingTests.xml
@@ -19,7 +19,7 @@
   -->
 <test-suite suite-name="marketingtests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-case case-name="marketing-tests">
         <simple-method-test location="component://marketing/minilang/marketing/test/MarketingTests.xml"/>
diff --git a/applications/order/config/OrderEntityLabels.xml b/applications/order/config/OrderEntityLabels.xml
index 491ff24..3da4e98 100644
--- a/applications/order/config/OrderEntityLabels.xml
+++ b/applications/order/config/OrderEntityLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="CustRequestResolution.description.DUPLICATE">
         <value xml:lang="ar">نسخة مكررة</value>
         <value xml:lang="de">Duplikat</value>
diff --git a/applications/order/config/OrderErrorUiLabels.xml b/applications/order/config/OrderErrorUiLabels.xml
index a0ae693..da700b7 100644
--- a/applications/order/config/OrderErrorUiLabels.xml
+++ b/applications/order/config/OrderErrorUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="OrderAnAlternateGwpProductIdWasInPlaceButWasEitherNotValidOrIsNoLongerInStockForId">
         <value xml:lang="de">Ein alternative Gratisbeigabe ist vorhanden, aber entweder nicht mehr gültig oder nicht mehr auf Lager : ${alternateGwpProductId}</value>
         <value xml:lang="en">An alternateGwpProductId was in place, but was either not valid or is no longer in stock for ID : ${alternateGwpProductId}</value>
diff --git a/applications/order/config/OrderUiLabels.xml b/applications/order/config/OrderUiLabels.xml
index 65cc71c..e2dbc69 100644
--- a/applications/order/config/OrderUiLabels.xml
+++ b/applications/order/config/OrderUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="BirtOrderReportsWarning">
         <value xml:lang="en">Four Birt reports (Last 3 Months Sales, Sales, Sales Order Discount Code, Product Demand) require to feed the BI data base (note that the bi.properties file will need to be updated after September 2026). Then only new approved orders will be taken into account.</value>
         <value xml:lang="fr">Quatre tableau créés par Birt (Ventes des 3 derniers mois, Ventes, Ventes par codes promotionels, Demandes par produit) nécessitent d'alimenter la base de données d'Inform. décis. (notez aussi la nécessaire màj du fichier bi.properties après septembre 2026). Ensuite seules les commandes nouvellement approuvées seront prises en compte.</value>
diff --git a/applications/order/entitydef/eecas.xml b/applications/order/entitydef/eecas.xml
index 9e13207..6cc5fd7 100644
--- a/applications/order/entitydef/eecas.xml
+++ b/applications/order/entitydef/eecas.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entity-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entity-eca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entity-eca.xsd">
     <!-- Inventory Issue ECAs for Immediately Fulfilled Orders -->
     <eca entity="OrderHeader" operation="create-store" event="return">
         <condition field-name="statusId" operator="equals" value="ORDER_COMPLETED"/>
diff --git a/applications/order/entitydef/entitymodel_view.xml b/applications/order/entitydef/entitymodel_view.xml
index e21265b..4469608 100644
--- a/applications/order/entitydef/entitymodel_view.xml
+++ b/applications/order/entitydef/entitymodel_view.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
   <!-- ========================================================= -->
   <!-- ======================== Defaults ======================= -->
   <!-- ========================================================= -->
diff --git a/applications/order/minilang/thirdparty/taxware/TaxwareFiles.xml b/applications/order/minilang/thirdparty/taxware/TaxwareFiles.xml
index b73915b..6735f91 100644
--- a/applications/order/minilang/thirdparty/taxware/TaxwareFiles.xml
+++ b/applications/order/minilang/thirdparty/taxware/TaxwareFiles.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <data-files xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/datafiles.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/datafiles.xsd">
     <data-file name="TaxwareOutHead" type-code="001" record-length="60" separator-style="fixed-record">
         <record name="outHead">
             <field name="NUMBER_RECORDS" position="0" length="6" type="Long"/>
diff --git a/applications/order/minilang/thirdparty/zipsales/ZipSalesTaxTables.xml b/applications/order/minilang/thirdparty/zipsales/ZipSalesTaxTables.xml
index 337d3b0..f880d6a 100644
--- a/applications/order/minilang/thirdparty/zipsales/ZipSalesTaxTables.xml
+++ b/applications/order/minilang/thirdparty/zipsales/ZipSalesTaxTables.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <data-files xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/datafiles.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/datafiles.xsd">
     <data-file name="FlatTaxTable" type-code="001" record-length="182" separator-style="fixed-length">
         <record name="taxEntry">
             <field name="zipCode" position="0" length="5" type="String"/>
diff --git a/applications/order/ofbiz-component.xml b/applications/order/ofbiz-component.xml
index 272ff27..fb0bbd3 100644
--- a/applications/order/ofbiz-component.xml
+++ b/applications/order/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="order"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
 
diff --git a/applications/order/servicedef/secas.xml b/applications/order/servicedef/secas.xml
index fb49517..c357e7c 100644
--- a/applications/order/servicedef/secas.xml
+++ b/applications/order/servicedef/secas.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
     <!-- order item status changes -->
     <eca service="storeOrder" event="return">
         <action service="resetGrandTotal" mode="sync"/>
diff --git a/applications/order/servicedef/services.xml b/applications/order/servicedef/services.xml
index 090ca90..7c4abf1 100644
--- a/applications/order/servicedef/services.xml
+++ b/applications/order/servicedef/services.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Order Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/order/servicedef/services_cart.xml b/applications/order/servicedef/services_cart.xml
index 4bca4aa..029efbf 100644
--- a/applications/order/servicedef/services_cart.xml
+++ b/applications/order/servicedef/services_cart.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Order (ShoppingCart) Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/order/servicedef/services_checkout.xml b/applications/order/servicedef/services_checkout.xml
index 13e63d9..dab1681 100644
--- a/applications/order/servicedef/services_checkout.xml
+++ b/applications/order/servicedef/services_checkout.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://www.ofbiz.org/dtds/services.xsd">
 
     <service name="createUpdateCustomerAndShippingAddress" engine="simple" location="component://order/minilang/order/CheckoutServices.xml" auth="false" invoke="createUpdateCustomerAndShippingAddress">
         <implements service="createUpdateShippingAddress"/>
diff --git a/applications/order/servicedef/services_order.xml b/applications/order/servicedef/services_order.xml
index ac29188..a4dc774 100644
--- a/applications/order/servicedef/services_order.xml
+++ b/applications/order/servicedef/services_order.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Order Services: Orders </description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/order/servicedef/services_perm.xml b/applications/order/servicedef/services_perm.xml
index 612acd4..fd5189d 100644
--- a/applications/order/servicedef/services_perm.xml
+++ b/applications/order/servicedef/services_perm.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <vendor>OFBiz</vendor>
     <version>1.0</version>
 
diff --git a/applications/order/servicedef/services_quote.xml b/applications/order/servicedef/services_quote.xml
index e20c0e1..db4d94e 100644
--- a/applications/order/servicedef/services_quote.xml
+++ b/applications/order/servicedef/services_quote.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Order Services: Quotes </description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/order/servicedef/services_request.xml b/applications/order/servicedef/services_request.xml
index 24db8ef..bf337b8 100644
--- a/applications/order/servicedef/services_request.xml
+++ b/applications/order/servicedef/services_request.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Order Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/order/servicedef/services_requirement.xml b/applications/order/servicedef/services_requirement.xml
index 50fea78..dc30446 100644
--- a/applications/order/servicedef/services_requirement.xml
+++ b/applications/order/servicedef/services_requirement.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Order Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/order/servicedef/services_reservations.xml b/applications/order/servicedef/services_reservations.xml
index 77c147f..25cef1a 100644
--- a/applications/order/servicedef/services_reservations.xml
+++ b/applications/order/servicedef/services_reservations.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Order Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/order/servicedef/services_return.xml b/applications/order/servicedef/services_return.xml
index dfd21d3..9bcaa16 100644
--- a/applications/order/servicedef/services_return.xml
+++ b/applications/order/servicedef/services_return.xml
@@ -18,7 +18,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Order Return Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/order/servicedef/services_shoppinglist.xml b/applications/order/servicedef/services_shoppinglist.xml
index 03c1684..b290ecb 100644
--- a/applications/order/servicedef/services_shoppinglist.xml
+++ b/applications/order/servicedef/services_shoppinglist.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Order Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/order/testdef/CustRequestTests.xml b/applications/order/testdef/CustRequestTests.xml
index a144869..232f2cb 100644
--- a/applications/order/testdef/CustRequestTests.xml
+++ b/applications/order/testdef/CustRequestTests.xml
@@ -20,7 +20,7 @@ under the License.
 
 <test-suite suite-name="custrequesttests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
         
     <test-case case-name="custrequest-tests">
         <simple-method-test location="component://order/minilang/test/CustRequestTests.xml"/>
diff --git a/applications/order/testdef/FinAccountTests.xml b/applications/order/testdef/FinAccountTests.xml
index a443e2f..6fd843d 100644
--- a/applications/order/testdef/FinAccountTests.xml
+++ b/applications/order/testdef/FinAccountTests.xml
@@ -20,7 +20,7 @@ under the License.
 
 <test-suite suite-name="finaccounttests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
         
     <test-case case-name="finaccount-tests">
         <junit-test-suite class-name="org.apache.ofbiz.order.test.FinAccountTest"/>
diff --git a/applications/order/testdef/OrderTest.xml b/applications/order/testdef/OrderTest.xml
index d6ddf5f..6b0b8a1 100644
--- a/applications/order/testdef/OrderTest.xml
+++ b/applications/order/testdef/OrderTest.xml
@@ -20,7 +20,7 @@ under the License.
 
 <test-suite suite-name="ordertests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
     <test-case case-name="order-tests-data-load">
         <entity-xml action="load" entity-xml-url="component://order/testdef/data/OrderTestData.xml"/>
     </test-case>
diff --git a/applications/order/testdef/ShoppingCartTests.xml b/applications/order/testdef/ShoppingCartTests.xml
index d95b746..ea892e8 100644
--- a/applications/order/testdef/ShoppingCartTests.xml
+++ b/applications/order/testdef/ShoppingCartTests.xml
@@ -20,7 +20,7 @@ under the License.
 
 <test-suite suite-name="shoppingcarttests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-case case-name="shoppingCart-test">
         <simple-method-test location="component://order/minilang/test/ShoppingCartTests.xml" name="testCreateShoppingCart"/>
diff --git a/applications/order/testdef/ShoppingListTests.xml b/applications/order/testdef/ShoppingListTests.xml
index e1a723c..71a2efa 100644
--- a/applications/order/testdef/ShoppingListTests.xml
+++ b/applications/order/testdef/ShoppingListTests.xml
@@ -20,7 +20,7 @@ under the License.
 
 <test-suite suite-name="shoppinglisttests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-case case-name="loadShoppingListTestData">
         <entity-xml action="load" entity-xml-url="component://order/testdef/data/ShoppingListTestData.xml"/>
diff --git a/applications/order/testdef/quotetests.xml b/applications/order/testdef/quotetests.xml
index 25fe633..b9f1995 100644
--- a/applications/order/testdef/quotetests.xml
+++ b/applications/order/testdef/quotetests.xml
@@ -20,7 +20,7 @@ under the License.
 
 <test-suite suite-name="quotetests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
         
     <test-case case-name="loadQuoteTestData">
         <entity-xml action="load" entity-xml-url="component://order/testdef/data/QuoteTestData.xml"/>
diff --git a/applications/party/config/PartyEntityLabels.xml b/applications/party/config/PartyEntityLabels.xml
index 23e1e96..78bcc7d 100644
--- a/applications/party/config/PartyEntityLabels.xml
+++ b/applications/party/config/PartyEntityLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="AgreementItemType.description.AGREEMENT_COMMISSION">
         <value xml:lang="ar">معدل العمولة</value>
         <value xml:lang="de">Kommission</value>
diff --git a/applications/party/config/PartyErrorUiLabels.xml b/applications/party/config/PartyErrorUiLabels.xml
index 57a970b..8d88a7c 100644
--- a/applications/party/config/PartyErrorUiLabels.xml
+++ b/applications/party/config/PartyErrorUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="commeventservices.communication_event_from_contact_mech_must_be_email">
         <value xml:lang="cs">Chyba: Komunikační událost musí mít jako odesílatele uvedenu emailovou adresu.</value>
         <value xml:lang="de">FEHLER: Kommunikationsereignis muss ein "Kontaktmechanismus von" besitzen das ein E-Mail als Kommunikationereignis ID ist</value>
diff --git a/applications/party/config/PartyUiLabels.xml b/applications/party/config/PartyUiLabels.xml
index 05ea878..27da273 100644
--- a/applications/party/config/PartyUiLabels.xml
+++ b/applications/party/config/PartyUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="FormFieldTitle_annualRevenue">
         <value xml:lang="ar">الدخل السنوي</value>
         <value xml:lang="de">Jahresumsatz</value>
diff --git a/applications/party/ofbiz-component.xml b/applications/party/ofbiz-component.xml
index 23dfcd7..b5a90e3 100644
--- a/applications/party/ofbiz-component.xml
+++ b/applications/party/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="party"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
 
diff --git a/applications/party/servicedef/mcas.xml b/applications/party/servicedef/mcas.xml
index 1a66e0d..ddc3273 100644
--- a/applications/party/servicedef/mcas.xml
+++ b/applications/party/servicedef/mcas.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-mca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-mca.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-mca.xsd">
 
     <mca mail-rule-name="logIncomingMessage">
         <action service="logIncomingMessage" mode="sync"/>
diff --git a/applications/party/servicedef/secas.xml b/applications/party/servicedef/secas.xml
index 9f98d32..35d093f 100644
--- a/applications/party/servicedef/secas.xml
+++ b/applications/party/servicedef/secas.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
     <eca service="createPerson" event="commit">
         <action service="ensureNaPartyRole" mode="sync"/>
     </eca>
diff --git a/applications/party/servicedef/services.xml b/applications/party/servicedef/services.xml
index 2552389..bd3965f 100644
--- a/applications/party/servicedef/services.xml
+++ b/applications/party/servicedef/services.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Party Component Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/party/servicedef/services_agreement.xml b/applications/party/servicedef/services_agreement.xml
index 3510076..061abfe 100644
--- a/applications/party/servicedef/services_agreement.xml
+++ b/applications/party/servicedef/services_agreement.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Party Component Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/party/servicedef/services_communication.xml b/applications/party/servicedef/services_communication.xml
index 5783e72..0d30bbe 100644
--- a/applications/party/servicedef/services_communication.xml
+++ b/applications/party/servicedef/services_communication.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Party Component Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/party/servicedef/services_contact.xml b/applications/party/servicedef/services_contact.xml
index 55a619c..9cf3272 100644
--- a/applications/party/servicedef/services_contact.xml
+++ b/applications/party/servicedef/services_contact.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Party Contact Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/party/servicedef/services_party.xml b/applications/party/servicedef/services_party.xml
index ccaaaa0..8267f4c 100644
--- a/applications/party/servicedef/services_party.xml
+++ b/applications/party/servicedef/services_party.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+          xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Party Component Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/party/servicedef/services_view.xml b/applications/party/servicedef/services_view.xml
index 35e61d8..d5c71ed 100644
--- a/applications/party/servicedef/services_view.xml
+++ b/applications/party/servicedef/services_view.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Party Component Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/party/testdef/PartyContactMechTests.xml b/applications/party/testdef/PartyContactMechTests.xml
index 62e206e..ad98f41 100644
--- a/applications/party/testdef/PartyContactMechTests.xml
+++ b/applications/party/testdef/PartyContactMechTests.xml
@@ -19,7 +19,7 @@
   -->
 <test-suite suite-name="partycontactmechtests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-case case-name="loadPartyContactMechTestData">
         <entity-xml action="load" entity-xml-url="component://party/testdef/data/PartyContactMechTestData.xml"/>
diff --git a/applications/party/testdef/PartyStatusChangeTests.xml b/applications/party/testdef/PartyStatusChangeTests.xml
index d8ec01c..35bb96b 100644
--- a/applications/party/testdef/PartyStatusChangeTests.xml
+++ b/applications/party/testdef/PartyStatusChangeTests.xml
@@ -19,7 +19,7 @@
   -->
 <test-suite suite-name="partystatuschangetests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-case case-name="partystatuschangetestdata">
         <entity-xml action="load" entity-xml-url="component://party/testdef/data/PartyStatusChangeTestData.xml"/>
diff --git a/applications/party/testdef/PartyTests.xml b/applications/party/testdef/PartyTests.xml
index 58abf61..fda96b1 100644
--- a/applications/party/testdef/PartyTests.xml
+++ b/applications/party/testdef/PartyTests.xml
@@ -19,7 +19,7 @@
   -->
 <test-suite suite-name="partytests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-case case-name="party-tests-data-load">
         <entity-xml action="load" entity-xml-url="component://party/testdef/data/PartyTestsData.xml"/>
diff --git a/applications/product/config/ProductEntityLabels.xml b/applications/product/config/ProductEntityLabels.xml
index 6786415..41578c1 100644
--- a/applications/product/config/ProductEntityLabels.xml
+++ b/applications/product/config/ProductEntityLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="CostComponentType.description.ACTUAL_LABOR_COST">
         <value xml:lang="de">Effektive Arbeitskosten</value>
         <value xml:lang="en">Actual Labor Cost</value>
diff --git a/applications/product/config/ProductErrorUiLabels.xml b/applications/product/config/ProductErrorUiLabels.xml
index 8ea7e74..2c87d7b 100644
--- a/applications/product/config/ProductErrorUiLabels.xml
+++ b/applications/product/config/ProductErrorUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="categoryservices.error_find_next_products">
         <value xml:lang="de">Fehler beim Ermitteln der vorherigen/nächsten Produktinformationen: ${errMessage}</value>
         <value xml:lang="en">Error finding previous/next product info: ${errMessage}</value>
diff --git a/applications/product/config/ProductPromoUiLabels.xml b/applications/product/config/ProductPromoUiLabels.xml
index 7dd8541..8e71638 100644
--- a/applications/product/config/ProductPromoUiLabels.xml
+++ b/applications/product/config/ProductPromoUiLabels.xml
@@ -15,7 +15,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="ProductPromoOperatorEquality.PPC_EQ">
         <value xml:lang="en">is</value>
         <value xml:lang="zh">等于</value>
diff --git a/applications/product/config/ProductUiLabels.xml b/applications/product/config/ProductUiLabels.xml
index bb41eec..3fa2122 100644
--- a/applications/product/config/ProductUiLabels.xml
+++ b/applications/product/config/ProductUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="AddNewProductFeatureToProduct">
         <value xml:lang="de">Neues Merkmal für dieses Produkt erstellen</value>
         <value xml:lang="en">Add new Product Feature to current product</value>
diff --git a/applications/product/entitydef/eecas.xml b/applications/product/entitydef/eecas.xml
index 0c657c2..d95aa3b 100644
--- a/applications/product/entitydef/eecas.xml
+++ b/applications/product/entitydef/eecas.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entity-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entity-eca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entity-eca.xsd">
     <!-- Product Keyword Indexing ECAs -->
     <eca entity="Product" operation="create" event="return">
         <condition field-name="autoCreateKeywords" operator="not-equals" value="N"/>
diff --git a/applications/product/entitydef/entitymodel_view.xml b/applications/product/entitydef/entitymodel_view.xml
index b0e4279..90e15df 100644
--- a/applications/product/entitydef/entitymodel_view.xml
+++ b/applications/product/entitydef/entitymodel_view.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
     
     <view-entity entity-name="ContentApprovalProductContentAndInfo"
             package-name="org.apache.ofbiz.content.content"
diff --git a/applications/product/ofbiz-component.xml b/applications/product/ofbiz-component.xml
index dc7043a..a616fba 100644
--- a/applications/product/ofbiz-component.xml
+++ b/applications/product/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="product"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
 
diff --git a/applications/product/servicedef/groups.xml b/applications/product/servicedef/groups.xml
index 13ad8ca..bdd536f 100644
--- a/applications/product/servicedef/groups.xml
+++ b/applications/product/servicedef/groups.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-group xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-group.xsd">
+               xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-group.xsd">
 
     <group name="createSalesAgreement" send-mode="all">
         <invoke name="createAgreement" mode="sync" result-to-context="true"/>
diff --git a/applications/product/servicedef/secas.xml b/applications/product/servicedef/secas.xml
index f95d58e..5ae4cf3 100644
--- a/applications/product/servicedef/secas.xml
+++ b/applications/product/servicedef/secas.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
     <!-- update inventory item -->
     <eca service="updateInventoryItem" event="commit">
         <condition field-name="statusId" operator="is-not-empty"/>
diff --git a/applications/product/servicedef/secas_shipment.xml b/applications/product/servicedef/secas_shipment.xml
index 44fe1a8..03c49ae 100644
--- a/applications/product/servicedef/secas_shipment.xml
+++ b/applications/product/servicedef/secas_shipment.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
     <!-- if a SALES_SHIPMENT is SHIPMENT_CANCELLED, cancel ItemIssuance and OrderShipment -->
     <eca service="updateShipment" event="commit">
         <condition-field field-name="statusId" operator="not-equals" to-field-name="oldStatusId"/>
diff --git a/applications/product/servicedef/services.xml b/applications/product/servicedef/services.xml
index 08de2da..d25cf50 100644
--- a/applications/product/servicedef/services.xml
+++ b/applications/product/servicedef/services.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Product Component Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/product/servicedef/services_config.xml b/applications/product/servicedef/services_config.xml
index 09e69e6..389a2f5 100644
--- a/applications/product/servicedef/services_config.xml
+++ b/applications/product/servicedef/services_config.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Product Config Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/product/servicedef/services_cost.xml b/applications/product/servicedef/services_cost.xml
index b219ff6..a7a7284 100644
--- a/applications/product/servicedef/services_cost.xml
+++ b/applications/product/servicedef/services_cost.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Product Costing Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/product/servicedef/services_facility.xml b/applications/product/servicedef/services_facility.xml
index 21cbf08..ba56db5 100644
--- a/applications/product/servicedef/services_facility.xml
+++ b/applications/product/servicedef/services_facility.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Product Component Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/product/servicedef/services_feature.xml b/applications/product/servicedef/services_feature.xml
index a6c7395..dfd8c15 100644
--- a/applications/product/servicedef/services_feature.xml
+++ b/applications/product/servicedef/services_feature.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Product Component Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/product/servicedef/services_inventory.xml b/applications/product/servicedef/services_inventory.xml
index a3fab48..dec742e 100644
--- a/applications/product/servicedef/services_inventory.xml
+++ b/applications/product/servicedef/services_inventory.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Product Inventory Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/product/servicedef/services_maint.xml b/applications/product/servicedef/services_maint.xml
index 5056c28..88055cf 100644
--- a/applications/product/servicedef/services_maint.xml
+++ b/applications/product/servicedef/services_maint.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Product Component Maintenance Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/product/servicedef/services_perm.xml b/applications/product/servicedef/services_perm.xml
index 59c1daa..b68129c 100644
--- a/applications/product/servicedef/services_perm.xml
+++ b/applications/product/servicedef/services_perm.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <vendor>OFBiz</vendor>
     <version>1.0</version>
 
diff --git a/applications/product/servicedef/services_picklist.xml b/applications/product/servicedef/services_picklist.xml
index 8f10ea2..3e813ec 100644
--- a/applications/product/servicedef/services_picklist.xml
+++ b/applications/product/servicedef/services_picklist.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Common Application Components Shipment Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/product/servicedef/services_price.xml b/applications/product/servicedef/services_price.xml
index 986035e..94913b1 100644
--- a/applications/product/servicedef/services_price.xml
+++ b/applications/product/servicedef/services_price.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Product Price Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/product/servicedef/services_pricepromo.xml b/applications/product/servicedef/services_pricepromo.xml
index 82faa90..de55e9e 100644
--- a/applications/product/servicedef/services_pricepromo.xml
+++ b/applications/product/servicedef/services_pricepromo.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Product Component Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/product/servicedef/services_rental.xml b/applications/product/servicedef/services_rental.xml
index efccce2..5c08757 100644
--- a/applications/product/servicedef/services_rental.xml
+++ b/applications/product/servicedef/services_rental.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Product Component Services</description>
 
     <service name="createFixedAssetAndLinkToProduct" default-entity-name="FixedAsset" engine="simple"
diff --git a/applications/product/servicedef/services_shipment.xml b/applications/product/servicedef/services_shipment.xml
index b74eb7e..1cbf489 100644
--- a/applications/product/servicedef/services_shipment.xml
+++ b/applications/product/servicedef/services_shipment.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Common Application Components Shipment Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/product/servicedef/services_shipment_dhl.xml b/applications/product/servicedef/services_shipment_dhl.xml
index 5c9e32b..faf6478 100644
--- a/applications/product/servicedef/services_shipment_dhl.xml
+++ b/applications/product/servicedef/services_shipment_dhl.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
   <description>DHL Shipment Interface Services, based on DHL ShipIt XML API</description>
   <vendor>OFBiz</vendor>
   <version>1.0</version>
diff --git a/applications/product/servicedef/services_shipment_fedex.xml b/applications/product/servicedef/services_shipment_fedex.xml
index 20176ec..723a266 100644
--- a/applications/product/servicedef/services_shipment_fedex.xml
+++ b/applications/product/servicedef/services_shipment_fedex.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
   <description>Fedex Shipment Interface Services, based on Ship Manager Direct XML API</description>
 
   <!-- FDXSubscriptionRequest/FDXSubscriptionReply -->
diff --git a/applications/product/servicedef/services_shipment_ups.xml b/applications/product/servicedef/services_shipment_ups.xml
index b78d300..2203ed9 100644
--- a/applications/product/servicedef/services_shipment_ups.xml
+++ b/applications/product/servicedef/services_shipment_ups.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Common Application Components Shipment Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/product/servicedef/services_shipment_usps.xml b/applications/product/servicedef/services_shipment_usps.xml
index 47001fd..e342d3b 100644
--- a/applications/product/servicedef/services_shipment_usps.xml
+++ b/applications/product/servicedef/services_shipment_usps.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Common Application Components Shipment Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/product/servicedef/services_shipmentgateway.xml b/applications/product/servicedef/services_shipmentgateway.xml
index 6274f04..cbdaebb 100644
--- a/applications/product/servicedef/services_shipmentgateway.xml
+++ b/applications/product/servicedef/services_shipmentgateway.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Accounting Shipment Gateway Config Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/product/servicedef/services_store.xml b/applications/product/servicedef/services_store.xml
index 6cad645..75a2c71 100644
--- a/applications/product/servicedef/services_store.xml
+++ b/applications/product/servicedef/services_store.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Product Component Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/product/servicedef/services_subscription.xml b/applications/product/servicedef/services_subscription.xml
index 9d5437f..7a319bf 100644
--- a/applications/product/servicedef/services_subscription.xml
+++ b/applications/product/servicedef/services_subscription.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Product Component Services for subscriptions entity (subscription entity not ContentRoles)</description>
     <vendor>OFBiz</vendor>
 
diff --git a/applications/product/servicedef/services_supplier.xml b/applications/product/servicedef/services_supplier.xml
index bc4e7e5..35177f9 100644
--- a/applications/product/servicedef/services_supplier.xml
+++ b/applications/product/servicedef/services_supplier.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Product Supplier Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/product/servicedef/services_uom.xml b/applications/product/servicedef/services_uom.xml
index db14b67..797ecec 100644
--- a/applications/product/servicedef/services_uom.xml
+++ b/applications/product/servicedef/services_uom.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Unit of Measure Conversion Services - Formula based on Product data</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/product/servicedef/services_view.xml b/applications/product/servicedef/services_view.xml
index ce97df7..e4c88ae 100644
--- a/applications/product/servicedef/services_view.xml
+++ b/applications/product/servicedef/services_view.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Product Component Maintenance Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/product/testdef/CatalogTests.xml b/applications/product/testdef/CatalogTests.xml
index 7ddc143..6ea815d 100644
--- a/applications/product/testdef/CatalogTests.xml
+++ b/applications/product/testdef/CatalogTests.xml
@@ -20,7 +20,7 @@ under the License.
 
 <test-suite suite-name="catalogtests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-case case-name="loadProductPriceTestData">
         <entity-xml action="load" entity-xml-url="component://product/testdef/data/ProductPriceTestData.xml"/>
diff --git a/applications/product/testdef/CostTests.xml b/applications/product/testdef/CostTests.xml
index 4761f3a..b8b9e3c 100644
--- a/applications/product/testdef/CostTests.xml
+++ b/applications/product/testdef/CostTests.xml
@@ -20,7 +20,7 @@ under the License.
 
 <test-suite suite-name="productcosttests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-case case-name="cost-tests">
         <simple-method-test location="component://product/minilang/product/test/CostTests.xml"/>
diff --git a/applications/product/testdef/FacilityTest.xml b/applications/product/testdef/FacilityTest.xml
index 8dcf21c..7471c9a 100644
--- a/applications/product/testdef/FacilityTest.xml
+++ b/applications/product/testdef/FacilityTest.xml
@@ -20,7 +20,7 @@ under the License.
 
 <test-suite suite-name="facilitytests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
     <test-case case-name="stockMove-test">
         <junit-test-suite class-name="org.apache.ofbiz.product.test.StockMovesTest"/>
     </test-case>
diff --git a/applications/product/testdef/GroupOrderTest.xml b/applications/product/testdef/GroupOrderTest.xml
index 920b68f..1a8801f 100644
--- a/applications/product/testdef/GroupOrderTest.xml
+++ b/applications/product/testdef/GroupOrderTest.xml
@@ -20,7 +20,7 @@ under the License.
 
 <test-suite suite-name="groupordertests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-case case-name="limitreached-test">
         <simple-method-test location="component://product/minilang/product/test/GroupOrderTest.xml" name="testGroupOrderLimitReached"/>
diff --git a/applications/product/testdef/ProductTagTest.xml b/applications/product/testdef/ProductTagTest.xml
index 098ca41..9f4e78e 100644
--- a/applications/product/testdef/ProductTagTest.xml
+++ b/applications/product/testdef/ProductTagTest.xml
@@ -20,7 +20,7 @@ under the License.
 
 <test-suite suite-name="producttagtests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-case case-name="producttag-test">
         <simple-method-test location="component://product/minilang/product/test/ProductTagTest.xml" name="testProductTag"/>
diff --git a/applications/product/testdef/ProductTest.xml b/applications/product/testdef/ProductTest.xml
index 0b358e4..c893925 100644
--- a/applications/product/testdef/ProductTest.xml
+++ b/applications/product/testdef/ProductTest.xml
@@ -20,7 +20,7 @@ under the License.
 
 <test-suite suite-name="producttests"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
         
     <test-case case-name="loadProductTestData">
         <entity-xml action="load" entity-xml-url="component://product/testdef/data/ProductTestData.xml"/>
diff --git a/applications/securityext/config/EmailPasswordUiLabels.xml b/applications/securityext/config/EmailPasswordUiLabels.xml
index c6a9d75..1d25c7e 100644
--- a/applications/securityext/config/EmailPasswordUiLabels.xml
+++ b/applications/securityext/config/EmailPasswordUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="SecurityExtANew">
         <value xml:lang="da">en ny</value>
         <value xml:lang="de">Ein neues</value>
diff --git a/applications/securityext/ofbiz-component.xml b/applications/securityext/ofbiz-component.xml
index f678b43..0dfc68f 100644
--- a/applications/securityext/ofbiz-component.xml
+++ b/applications/securityext/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="securityext"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
     
diff --git a/applications/securityext/servicedef/services.xml b/applications/securityext/servicedef/services.xml
index 58a891f..587385e 100644
--- a/applications/securityext/servicedef/services.xml
+++ b/applications/securityext/servicedef/services.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>OFBiz Security Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/workeffort/config/WorkEffortEntityLabels.xml b/applications/workeffort/config/WorkEffortEntityLabels.xml
index 4e379e9..e528643 100644
--- a/applications/workeffort/config/WorkEffortEntityLabels.xml
+++ b/applications/workeffort/config/WorkEffortEntityLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="RateType.description.DISCOUNTED">
         <value xml:lang="en">Discounted Hourly Rate</value>
         <value xml:lang="fr">Taux horaire escompté</value>
diff --git a/applications/workeffort/config/WorkEffortUiLabels.xml b/applications/workeffort/config/WorkEffortUiLabels.xml
index ce9da33..dedb902 100644
--- a/applications/workeffort/config/WorkEffortUiLabels.xml
+++ b/applications/workeffort/config/WorkEffortUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="FormFieldTitle_accommodationMapId">
         <value xml:lang="en">Accommodation Map Id</value>
         <value xml:lang="fr">Réf. de plan de logement</value>
diff --git a/applications/workeffort/entitydef/eecas.xml b/applications/workeffort/entitydef/eecas.xml
index c41c197..9d080d6 100644
--- a/applications/workeffort/entitydef/eecas.xml
+++ b/applications/workeffort/entitydef/eecas.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entity-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entity-eca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entity-eca.xsd">
     <!-- WorkEffort Keyword Indexing ECAs -->
     <eca entity="WorkEffort" operation="create-store" event="return">
         <action service="indexWorkEffortKeywords" mode="sync" value-attr="workEffortInstance"/>
diff --git a/applications/workeffort/entitydef/entitymodel_view.xml b/applications/workeffort/entitydef/entitymodel_view.xml
index 8b3af1f..17b7ce3 100644
--- a/applications/workeffort/entitydef/entitymodel_view.xml
+++ b/applications/workeffort/entitydef/entitymodel_view.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
   <!-- ========================================================= -->
   <!-- ======================== Defaults ======================= -->
   <!-- ========================================================= -->
diff --git a/applications/workeffort/ofbiz-component.xml b/applications/workeffort/ofbiz-component.xml
index aadf733..4db970f 100644
--- a/applications/workeffort/ofbiz-component.xml
+++ b/applications/workeffort/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="workeffort"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
 
diff --git a/applications/workeffort/servicedef/secas.xml b/applications/workeffort/servicedef/secas.xml
index eb378a2..aa87e72 100644
--- a/applications/workeffort/servicedef/secas.xml
+++ b/applications/workeffort/servicedef/secas.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
     <eca service="createWorkEffort" event="commit">
         <condition field-name="quickAssignPartyId" operator="is-not-empty"/>
         <action service="quickAssignPartyToWorkEffort" mode="sync"/>
diff --git a/applications/workeffort/servicedef/service_groups.xml b/applications/workeffort/servicedef/service_groups.xml
index ea5040e..bba4ff0 100644
--- a/applications/workeffort/servicedef/service_groups.xml
+++ b/applications/workeffort/servicedef/service_groups.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-group xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-group.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-group.xsd">
 
     <group name="updateWorkEffortAndAssoc" send-mode="all"  >
         <invoke name="updateWorkEffort" mode="sync"/>
diff --git a/applications/workeffort/servicedef/services.xml b/applications/workeffort/servicedef/services.xml
index 2e785fe..89f1765 100644
--- a/applications/workeffort/servicedef/services.xml
+++ b/applications/workeffort/servicedef/services.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Common Application Shared WorkEffort Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/workeffort/servicedef/services_timesheet.xml b/applications/workeffort/servicedef/services_timesheet.xml
index 3fd4749..ab1e0a0 100644
--- a/applications/workeffort/servicedef/services_timesheet.xml
+++ b/applications/workeffort/servicedef/services_timesheet.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>WorkEffort Timesheet Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/workeffort/servicedef/services_workeffort.xml b/applications/workeffort/servicedef/services_workeffort.xml
index cd5eeef..b337d0f 100644
--- a/applications/workeffort/servicedef/services_workeffort.xml
+++ b/applications/workeffort/servicedef/services_workeffort.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>WorkEffort WorkEffort Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/applications/workeffort/testdef/workefforttests.xml b/applications/workeffort/testdef/workefforttests.xml
index 0cb8a5d..0b3dade 100644
--- a/applications/workeffort/testdef/workefforttests.xml
+++ b/applications/workeffort/testdef/workefforttests.xml
@@ -19,7 +19,7 @@
   -->
 <test-suite suite-name="workefforttests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
     <!-- TODO: Move these test implementations to a separate simple methods document -->
     <test-case case-name="workeffort-tests-data-load">
         <entity-xml action="load" entity-xml-url="component://workeffort/testdef/data/WorkEffortTestData.xml"/>
diff --git a/framework/base/config/DateTimeLabels.xml b/framework/base/config/DateTimeLabels.xml
index a525e95..a884283 100644
--- a/framework/base/config/DateTimeLabels.xml
+++ b/framework/base/config/DateTimeLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="hour.plural">
         <value xml:lang="ar">ساعات</value>
         <value xml:lang="de">Stunden</value>
diff --git a/framework/base/config/component-load.xml b/framework/base/config/component-load.xml
index 72a7176..48e3f49 100644
--- a/framework/base/config/component-load.xml
+++ b/framework/base/config/component-load.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <component-loader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/component-loader.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/component-loader.xsd">
     <load-components parent-directory="framework"/>
     <load-components parent-directory="themes"/>
     <load-components parent-directory="applications"/>
diff --git a/framework/base/config/jndiservers.xml b/framework/base/config/jndiservers.xml
index 58cf3f6..6792230 100644
--- a/framework/base/config/jndiservers.xml
+++ b/framework/base/config/jndiservers.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <jndi-config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/jndi-config.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/jndi-config.xsd">
 
     <!-- this jndi-server has no parameters so the factory will use the default
         InitialContext constructor which gets these values from the jndi.properties file -->
diff --git a/framework/base/config/ofbiz-containers.xml b/framework/base/config/ofbiz-containers.xml
index 726fadc..0fb7b2e 100644
--- a/framework/base/config/ofbiz-containers.xml
+++ b/framework/base/config/ofbiz-containers.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <ofbiz-containers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-containers.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-containers.xsd">
 
     <!-- load the ofbiz component container (always first) -->
     <container name="component-container" loaders="main,rmi,load-data,test" class="org.apache.ofbiz.base.container.ComponentContainer"/>
diff --git a/framework/base/ofbiz-component.xml b/framework/base/ofbiz-component.xml
index 37dfb71..b9fe894 100644
--- a/framework/base/ofbiz-component.xml
+++ b/framework/base/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="base"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="dtd"/>
     <classpath type="dir" location="config"/>
diff --git a/framework/base/testdef/basetests.xml b/framework/base/testdef/basetests.xml
index 41b7d49..54f8308 100644
--- a/framework/base/testdef/basetests.xml
+++ b/framework/base/testdef/basetests.xml
@@ -20,7 +20,7 @@
 
 <test-suite suite-name="basetests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
     <test-group case-name="basetests">
         <junit-test-suite class-name="org.apache.ofbiz.base.lang.test.ComparableRangeTests"/>
         <junit-test-suite class-name="org.apache.ofbiz.base.util.test.AssertTests"/>
diff --git a/framework/catalina/entitydef/entitymodel.xml b/framework/catalina/entitydef/entitymodel.xml
index 7786990..b63d8c3 100644
--- a/framework/catalina/entitydef/entitymodel.xml
+++ b/framework/catalina/entitydef/entitymodel.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
   <!-- ========================================================= -->
   <!-- ======================== Defaults ======================= -->
   <!-- ========================================================= -->
diff --git a/framework/catalina/ofbiz-component.xml b/framework/catalina/ofbiz-component.xml
index 8178aae..176a36e 100644
--- a/framework/catalina/ofbiz-component.xml
+++ b/framework/catalina/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="catalina"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
diff --git a/framework/common/config/CommonEntityLabels.xml b/framework/common/config/CommonEntityLabels.xml
index e5e69c3..1c920be 100644
--- a/framework/common/config/CommonEntityLabels.xml
+++ b/framework/common/config/CommonEntityLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="CustomMethod.description.6000">
         <value xml:lang="cs">Příklad vzorce pro splnění úkolu (qty * estimatedMilliSeconds * 10)</value>
         <value xml:lang="de">Beispiel Formel für Aufgabe (qty * estimatedMilliSeconds * 10)</value>
diff --git a/framework/common/config/CommonErrorUiLabels.xml b/framework/common/config/CommonErrorUiLabels.xml
index d036439..ca003d3 100644
--- a/framework/common/config/CommonErrorUiLabels.xml
+++ b/framework/common/config/CommonErrorUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="CommonErrorDuplicateKey">
         <value xml:lang="de">Doppelter Primärschlüssel. Der Primärschlüssel existiert bereits.</value>
         <value xml:lang="en">Duplicate Key. The Key already exist.</value>
diff --git a/framework/common/config/CommonHelpUiLabels.xml b/framework/common/config/CommonHelpUiLabels.xml
index 2f4d831..0ef0b71 100644
--- a/framework/common/config/CommonHelpUiLabels.xml
+++ b/framework/common/config/CommonHelpUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="HelpNotFound">
         <value xml:lang="da">Hjælp emne ikke fundet</value>
         <value xml:lang="de">Hilfe Thema nicht gefunden.</value>
diff --git a/framework/common/config/CommonPortalEntityLabels.xml b/framework/common/config/CommonPortalEntityLabels.xml
index bd65f51..5da70b7 100644
--- a/framework/common/config/CommonPortalEntityLabels.xml
+++ b/framework/common/config/CommonPortalEntityLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="PortalPage.portalPageName.MYPORTAL_EMPLOYEE">
         <value xml:lang="en">Main</value>
         <value xml:lang="es">Principal</value>
diff --git a/framework/common/config/CommonUiLabels.xml b/framework/common/config/CommonUiLabels.xml
index 7192b5f..a1734bc 100644
--- a/framework/common/config/CommonUiLabels.xml
+++ b/framework/common/config/CommonUiLabels.xml
@@ -17,7 +17,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
 
     <property key="Accounting - AP">
         <value xml:lang="ar">ذمم دائنة</value>
diff --git a/framework/common/config/PrefErrorUiLabels.xml b/framework/common/config/PrefErrorUiLabels.xml
index 0f52086..e8661c6 100644
--- a/framework/common/config/PrefErrorUiLabels.xml
+++ b/framework/common/config/PrefErrorUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="copyPreference.invalidArgument">
         <value xml:lang="de">Benutzereinstellungen konnten nicht kopiert werden: ungültige Argumente</value>
         <value xml:lang="en">Could not copy user preferences: Invalid argument(s)</value>
diff --git a/framework/common/config/SecurityUiLabels.xml b/framework/common/config/SecurityUiLabels.xml
index 2e74e44..ad6f50f 100644
--- a/framework/common/config/SecurityUiLabels.xml
+++ b/framework/common/config/SecurityUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="AddPermissionManuallyToSecurityGroup">
         <value xml:lang="de">Berechtigung (durch Eingabe) zur Sicherheitsgruppe hinzufügen</value>
         <value xml:lang="en">Add Permission (manually) to Security Group</value>
diff --git a/framework/common/config/SecurityextUiLabels.xml b/framework/common/config/SecurityextUiLabels.xml
index 7de0db2..2368438 100644
--- a/framework/common/config/SecurityextUiLabels.xml
+++ b/framework/common/config/SecurityextUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="loginevents.error_accessing_password">
         <value xml:lang="de">Fehler beim Zugriff auf Passwort: ${errorMessage}.</value>
         <value xml:lang="en">Error accessing password: ${errorMessage}.</value>
diff --git a/framework/common/config/TemporalExpressionUiLabels.xml b/framework/common/config/TemporalExpressionUiLabels.xml
index fc4d521..0efff05 100644
--- a/framework/common/config/TemporalExpressionUiLabels.xml
+++ b/framework/common/config/TemporalExpressionUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="TemporalExpression">
         <value xml:lang="de">Zeitlicher Ausdruck</value>
         <value xml:lang="en">Temporal Expression</value>
diff --git a/framework/common/entitydef/entitymodel.xml b/framework/common/entitydef/entitymodel.xml
index cb122d6..15bab2c 100644
--- a/framework/common/entitydef/entitymodel.xml
+++ b/framework/common/entitydef/entitymodel.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
   <!-- ========================================================= -->
   <!-- ======================== Defaults ======================= -->
   <!-- ========================================================= -->
diff --git a/framework/common/ofbiz-component.xml b/framework/common/ofbiz-component.xml
index a0d7247..4f9a5e7 100644
--- a/framework/common/ofbiz-component.xml
+++ b/framework/common/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="common"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
     
diff --git a/framework/common/servicedef/groups_test.xml b/framework/common/servicedef/groups_test.xml
index 6ce5500..efec010 100644
--- a/framework/common/servicedef/groups_test.xml
+++ b/framework/common/servicedef/groups_test.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-group xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-group.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-group.xsd">
     <group name="testGroup" send-mode="all">
         <invoke name="testScv" mode="sync"/>
     </group>
diff --git a/framework/common/servicedef/secas_cdyne.xml b/framework/common/servicedef/secas_cdyne.xml
index 95275f1..4e78610 100644
--- a/framework/common/servicedef/secas_cdyne.xml
+++ b/framework/common/servicedef/secas_cdyne.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
     <!-- NOTE: Uncomment these to use the CDyne services to fill in the county
     <eca service="createPostalAddress" event="commit">
         <action service="cdynePostalAddressFillInCounty" mode="sync"/>
diff --git a/framework/common/servicedef/secas_test.xml b/framework/common/servicedef/secas_test.xml
index 6fe3b49..24969da 100644
--- a/framework/common/servicedef/secas_test.xml
+++ b/framework/common/servicedef/secas_test.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
     <eca service="testScv" event="invoke">
         <condition field-name="message" operator="equals" value="auto"/>
         <set field-name="message" value="set message to auto message"/>
diff --git a/framework/common/servicedef/services.xml b/framework/common/servicedef/services.xml
index f2ca850..53ce51b 100644
--- a/framework/common/servicedef/services.xml
+++ b/framework/common/servicedef/services.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Common Application Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/framework/common/servicedef/services_cdyne.xml b/framework/common/servicedef/services_cdyne.xml
index 8662ebf..74c3027 100644
--- a/framework/common/servicedef/services_cdyne.xml
+++ b/framework/common/servicedef/services_cdyne.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>OFBIZ CDyne Services: for info see http://www.cdyne.com/developers/overview.aspx</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/framework/common/servicedef/services_email.xml b/framework/common/servicedef/services_email.xml
index d687c04..7e7f46a 100644
--- a/framework/common/servicedef/services_email.xml
+++ b/framework/common/servicedef/services_email.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Content Component Services</description>
     <vendor>OFBiz</vendor>
 
diff --git a/framework/common/servicedef/services_enum.xml b/framework/common/servicedef/services_enum.xml
index 5e77627..8a3da1e 100644
--- a/framework/common/servicedef/services_enum.xml
+++ b/framework/common/servicedef/services_enum.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>OFBiz Enum Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/framework/common/servicedef/services_geo.xml b/framework/common/servicedef/services_geo.xml
index 1d9ea0d..1abab11 100644
--- a/framework/common/servicedef/services_geo.xml
+++ b/framework/common/servicedef/services_geo.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>OFBiz Geo Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/framework/common/servicedef/services_method.xml b/framework/common/servicedef/services_method.xml
index 671ecfb..43d121f 100644
--- a/framework/common/servicedef/services_method.xml
+++ b/framework/common/servicedef/services_method.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>OFBiz Method Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/framework/common/servicedef/services_qrcode.xml b/framework/common/servicedef/services_qrcode.xml
index 5714621..84855ee 100644
--- a/framework/common/servicedef/services_qrcode.xml
+++ b/framework/common/servicedef/services_qrcode.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>QRCode Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/framework/common/servicedef/services_security.xml b/framework/common/servicedef/services_security.xml
index 4ef8768..dbc5de6 100644
--- a/framework/common/servicedef/services_security.xml
+++ b/framework/common/servicedef/services_security.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>OFBiz Security Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/framework/common/servicedef/services_test.xml b/framework/common/servicedef/services_test.xml
index 59f2cfe..144357f 100644
--- a/framework/common/servicedef/services_test.xml
+++ b/framework/common/servicedef/services_test.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>OFBIZ Test Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/framework/common/servicedef/smcas_test.xml b/framework/common/servicedef/smcas_test.xml
index 633ac04..2bbd597 100644
--- a/framework/common/servicedef/smcas_test.xml
+++ b/framework/common/servicedef/smcas_test.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-mca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-mca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-mca.xsd">
     <mca mail-rule-name="testRule1">
         <condition-field field-name="to" operator="matches" value=".*@ofbiz\.org"/>
         <condition-field field-name="subject" operator="matches" value=".*Test.*"/>
diff --git a/framework/common/testdef/PerformFindTests.xml b/framework/common/testdef/PerformFindTests.xml
index 758a756..ca1424a 100644
--- a/framework/common/testdef/PerformFindTests.xml
+++ b/framework/common/testdef/PerformFindTests.xml
@@ -20,7 +20,7 @@
 
 <test-suite suite-name="performfindtests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-case case-name="performfind-tests">
         <junit-test-suite class-name="org.apache.ofbiz.common.test.PerformFindTests"/>
diff --git a/framework/common/testdef/UserLoginTests.xml b/framework/common/testdef/UserLoginTests.xml
index c74ed86..e30def0 100644
--- a/framework/common/testdef/UserLoginTests.xml
+++ b/framework/common/testdef/UserLoginTests.xml
@@ -20,7 +20,7 @@
 
 <test-suite suite-name="userlogintests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-case case-name="userlogin-tests">
         <simple-method-test location="component://common/minilang/test/UserLoginTests.xml"/>
diff --git a/framework/component-load.xml b/framework/component-load.xml
index a7f7779..1156327 100644
--- a/framework/component-load.xml
+++ b/framework/component-load.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <component-loader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/component-loader.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/component-loader.xsd">
     <load-component component-location="base"/>
     <load-component component-location="entity"/>
     <load-component component-location="security"/>
diff --git a/framework/datafile/ofbiz-component.xml b/framework/datafile/ofbiz-component.xml
index 10e8591..683984f 100644
--- a/framework/datafile/ofbiz-component.xml
+++ b/framework/datafile/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="datafile"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="dtd"/>
 </ofbiz-component>
diff --git a/framework/documents/DataFiles.xml b/framework/documents/DataFiles.xml
index 8b90139..2623bc8 100644
--- a/framework/documents/DataFiles.xml
+++ b/framework/documents/DataFiles.xml
@@ -120,7 +120,7 @@ enter a path for it in the "Save to entity xml file:
                 <example>
                     <title> posschema.xml:</title>
                     <programlisting><![CDATA[
-    <data-files xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/datafiles.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <data-files xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/datafiles.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
         <data-file name="posreport" separator-style="fixed-length" type-code="text">
             <record name="tillentry" limit="many">
                 <field name="tillCode" type="String" length="16" position="0">
@@ -146,7 +146,7 @@ enter a path for it in the "Save to entity xml file:
                 <example>
                     <title>Another example reading fixed record little endian binary files</title>
                     <programlisting><![CDATA[
-                    <data-files xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/datafiles.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                    <data-files xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/datafiles.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
                         <data-file name="stockdata" separator-style="fixed-record" type-code="text" record-length="768">
                             <record name="stockdataitem" limit="many">
                                 <field name="barcode" type="NullTerminatedString" length="12" position="0">
@@ -190,7 +190,7 @@ enter a path for it in the "Save to entity xml file:
 
                 <title>Sample xml definition file for importing select columns posschema.xml:</title>
                 <programlisting><![CDATA[
-                <data-files xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/datafiles.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                <data-files xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/datafiles.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
                     <data-file name="posreport" separator-style="fixed-length" type-code="text">
                         <record name="tillentry" limit="many">
                             <field name="tillCode" type="String" length="16" position="0">
@@ -216,7 +216,7 @@ enter a path for it in the "Save to entity xml file:
 
                 <title> Another example reading fixed record little endian binary files</title>
                 <programlisting><![CDATA[
-                <data-files xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/datafiles.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                <data-files xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/datafiles.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
                     <data-file name="stockdata" separator-style="fixed-record" type-code="text" record-length="768">
                         <record name="stockdataitem" limit="many">
                             <field name="barcode" type="NullTerminatedString" length="12" position="0">
diff --git a/framework/documents/UnitTest.xml b/framework/documents/UnitTest.xml
index f8f6304..143b267 100644
--- a/framework/documents/UnitTest.xml
+++ b/framework/documents/UnitTest.xml
@@ -40,7 +40,7 @@
                 <programlisting>
                     &lt;test-suite suite-name="servicetests"
                         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd"&gt;
+                        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd"&gt;
                         ....
                         ....
                         &lt;test-case case-name="test-case-name"&gt;
diff --git a/framework/entity/config/entityengine.xml b/framework/entity/config/entityengine.xml
index 1247538..33d0662 100644
--- a/framework/entity/config/entityengine.xml
+++ b/framework/entity/config/entityengine.xml
@@ -22,7 +22,7 @@ under the License.
 access. For a detailed description see the core/docs/entityconfig.html file.
 -->
 <entity-config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entity-config.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entity-config.xsd">
     <resource-loader name="fieldfile" class="org.apache.ofbiz.base.config.FileLoader"
             prepend-env="ofbiz.home" prefix="/framework/entity/fieldtype/"/>
 
diff --git a/framework/entity/entitydef/entitygroup.xml b/framework/entity/entitydef/entitygroup.xml
index f0c3a7d..8e2555e 100644
--- a/framework/entity/entitydef/entitygroup.xml
+++ b/framework/entity/entitydef/entitygroup.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitygroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitygroup.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitygroup.xsd">
 
     <!-- ========================================================= -->
     <!-- org.apache.ofbiz.entity.tenant -->
diff --git a/framework/entity/entitydef/entitymodel.xml b/framework/entity/entitydef/entitymodel.xml
index e1b20c7..64c9ca6 100644
--- a/framework/entity/entitydef/entitymodel.xml
+++ b/framework/entity/entitydef/entitymodel.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
     <!-- ========================================================= -->
     <!-- ======================== Defaults ======================= -->
     <!-- ========================================================= -->
diff --git a/framework/entity/entitydef/entitymodel_test.xml b/framework/entity/entitydef/entitymodel_test.xml
index 8f84e73..18367e1 100644
--- a/framework/entity/entitydef/entitymodel_test.xml
+++ b/framework/entity/entitydef/entitymodel_test.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
   <!-- ========================================================= -->
   <!-- ======================== Defaults ======================= -->
   <!-- ========================================================= -->
diff --git a/framework/entity/fieldtype/fieldtypeadvantage.xml b/framework/entity/fieldtype/fieldtypeadvantage.xml
index 9f81c3e..b137ee4 100644
--- a/framework/entity/fieldtype/fieldtypeadvantage.xml
+++ b/framework/entity/fieldtype/fieldtypeadvantage.xml
@@ -21,7 +21,7 @@ under the License.
 <!-- www.advantagedatabase.com -->
 
 <fieldtypemodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
 
     <!-- ===================== field-type-def ==================== -->
     <!-- General Types -->
diff --git a/framework/entity/fieldtype/fieldtypeaxion.xml b/framework/entity/fieldtype/fieldtypeaxion.xml
index 2ce5f3b..32e002a 100644
--- a/framework/entity/fieldtype/fieldtypeaxion.xml
+++ b/framework/entity/fieldtype/fieldtypeaxion.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <fieldtypemodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
   <!-- ===================== field-type-def ==================== -->
    <!-- General Types -->
     <field-type-def type="blob" sql-type="BLOB" java-type="java.sql.Blob"/>
diff --git a/framework/entity/fieldtype/fieldtypedaffodil.xml b/framework/entity/fieldtype/fieldtypedaffodil.xml
index 8abda56..7a96968 100644
--- a/framework/entity/fieldtype/fieldtypedaffodil.xml
+++ b/framework/entity/fieldtype/fieldtypedaffodil.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <fieldtypemodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
   <!-- ===================== field-type-def ==================== -->
    <!-- General Types -->
     <field-type-def type="blob" sql-type="BLOB" java-type="java.sql.Blob"/>
diff --git a/framework/entity/fieldtype/fieldtypederby.xml b/framework/entity/fieldtype/fieldtypederby.xml
index 80d2cfe..b7b9f8c 100644
--- a/framework/entity/fieldtype/fieldtypederby.xml
+++ b/framework/entity/fieldtype/fieldtypederby.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <fieldtypemodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
   <!-- ===================== field-type-def ==================== -->
     <!-- General Types -->
     <field-type-def type="blob" sql-type="BLOB" java-type="java.sql.Blob"/>
diff --git a/framework/entity/fieldtype/fieldtypefirebird.xml b/framework/entity/fieldtype/fieldtypefirebird.xml
index d449c1c..920593b 100644
--- a/framework/entity/fieldtype/fieldtypefirebird.xml
+++ b/framework/entity/fieldtype/fieldtypefirebird.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <fieldtypemodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
   <!-- ===================== field-type-def ==================== -->
    <!-- General Types -->
     <field-type-def type="blob" sql-type="BLOB" java-type="java.sql.Blob"/>
diff --git a/framework/entity/fieldtype/fieldtypehsql.xml b/framework/entity/fieldtype/fieldtypehsql.xml
index fe96fff..203bc13 100644
--- a/framework/entity/fieldtype/fieldtypehsql.xml
+++ b/framework/entity/fieldtype/fieldtypehsql.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <fieldtypemodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
   <!-- ===================== field-type-def ==================== -->
     <!-- General Types -->
     <field-type-def type="blob" sql-type="OBJECT" sql-type-alias="OTHER" java-type="java.sql.Blob"/>
diff --git a/framework/entity/fieldtype/fieldtypemssql.xml b/framework/entity/fieldtype/fieldtypemssql.xml
index 25e2d05..1fa14ae 100644
--- a/framework/entity/fieldtype/fieldtypemssql.xml
+++ b/framework/entity/fieldtype/fieldtypemssql.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <fieldtypemodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
   <!-- ===================== field-type-def ==================== -->
     <!-- General Types -->
     <field-type-def type="blob" sql-type="IMAGE" java-type="java.sql.Blob"/>
diff --git a/framework/entity/fieldtype/fieldtypemysql.xml b/framework/entity/fieldtype/fieldtypemysql.xml
index beb9fa3..bc938a4 100644
--- a/framework/entity/fieldtype/fieldtypemysql.xml
+++ b/framework/entity/fieldtype/fieldtypemysql.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <fieldtypemodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
   <!-- ===================== field-type-def ==================== -->
     <!-- General Types -->
     <field-type-def type="blob" sql-type="LONGBLOB" java-type="java.sql.Blob"/>
diff --git a/framework/entity/fieldtype/fieldtypeoracle.xml b/framework/entity/fieldtype/fieldtypeoracle.xml
index 03e66ab..7043eb5 100644
--- a/framework/entity/fieldtype/fieldtypeoracle.xml
+++ b/framework/entity/fieldtype/fieldtypeoracle.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <fieldtypemodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
   <!-- ===================== field-type-def ==================== -->
     <!-- General Types -->
     <field-type-def type="blob" sql-type="BLOB" java-type="java.sql.Blob"/>
diff --git a/framework/entity/fieldtype/fieldtypepostgres.xml b/framework/entity/fieldtype/fieldtypepostgres.xml
index 8cb243e..ebe6e21 100644
--- a/framework/entity/fieldtype/fieldtypepostgres.xml
+++ b/framework/entity/fieldtype/fieldtypepostgres.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <fieldtypemodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
   <!-- ===================== field-type-def ==================== -->
     <!-- General Types -->
     <field-type-def type="blob" sql-type="BYTEA" java-type="java.sql.Blob"/>
diff --git a/framework/entity/fieldtype/fieldtypesapdb.xml b/framework/entity/fieldtype/fieldtypesapdb.xml
index d10aea3..9d5082b 100644
--- a/framework/entity/fieldtype/fieldtypesapdb.xml
+++ b/framework/entity/fieldtype/fieldtypesapdb.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <fieldtypemodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
   <!-- ===================== field-type-def ==================== -->
    <!-- General Types -->
     <field-type-def type="blob" sql-type="LONG BYTE" sql-type-alias="LONG BYTE" java-type="java.sql.Blob"/>
diff --git a/framework/entity/fieldtype/fieldtypesybase.xml b/framework/entity/fieldtype/fieldtypesybase.xml
index e61cd84..950af30 100644
--- a/framework/entity/fieldtype/fieldtypesybase.xml
+++ b/framework/entity/fieldtype/fieldtypesybase.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <fieldtypemodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/fieldtypemodel.xsd">
   <!-- ===================== field-type-def ==================== -->
     <!-- General Types -->
     <field-type-def type="blob" sql-type="IMAGE" java-type="java.sql.Blob"/>
diff --git a/framework/entity/ofbiz-component.xml b/framework/entity/ofbiz-component.xml
index 33a9ecf..5e4b263 100644
--- a/framework/entity/ofbiz-component.xml
+++ b/framework/entity/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="entity"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="dtd"/>
     <classpath type="dir" location="config"/>
diff --git a/framework/entity/testdef/entitytests.xml b/framework/entity/testdef/entitytests.xml
index dce7577..eb3c5f2 100644
--- a/framework/entity/testdef/entitytests.xml
+++ b/framework/entity/testdef/entitytests.xml
@@ -20,7 +20,7 @@ under the License.
 
 <test-suite suite-name="entitytests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
     <test-case case-name="entity-tests"><junit-test-suite class-name="org.apache.ofbiz.entity.test.EntityTestSuite"/></test-case>
     <test-case case-name="entity-crypto-tests"><junit-test-suite class-name="org.apache.ofbiz.entity.test.EntityCryptoTestSuite"/></test-case>
     <test-case case-name="entity-query-tests"><junit-test-suite class-name="org.apache.ofbiz.entity.test.EntityQueryTestSuite"/></test-case>
diff --git a/framework/entityext/config/EntityExtUiLabels.xml b/framework/entityext/config/EntityExtUiLabels.xml
index 7c840eb..7c3b99e 100644
--- a/framework/entityext/config/EntityExtUiLabels.xml
+++ b/framework/entityext/config/EntityExtUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="EntityExtCannotDoEntitySyncPush">
         <value xml:lang="en">Cannot do Entity Sync Push because entitySyncId [] is set for Pull Only.</value>
         <value xml:lang="fr">Impossible d'effectuer la synchro (push) avec un configuration en mode esclave seulement (pull only).</value>
diff --git a/framework/entityext/entitydef/entitymodel.xml b/framework/entityext/entitydef/entitymodel.xml
index d039bbb..68a0e89 100644
--- a/framework/entityext/entitydef/entitymodel.xml
+++ b/framework/entityext/entitydef/entitymodel.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
   <!-- ========================================================= -->
   <!-- ======================== Defaults ======================= -->
   <!-- ========================================================= -->
diff --git a/framework/entityext/ofbiz-component.xml b/framework/entityext/ofbiz-component.xml
index 3ea4508..f91b82a 100644
--- a/framework/entityext/ofbiz-component.xml
+++ b/framework/entityext/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="entityext"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
     
diff --git a/framework/entityext/servicedef/groups.xml b/framework/entityext/servicedef/groups.xml
index 7eb4726..87764e6 100644
--- a/framework/entityext/servicedef/groups.xml
+++ b/framework/entityext/servicedef/groups.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-group xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-group.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-group.xsd">
 
     <!-- Entity Engine Service Groups (Distributed Cache Clearing) -->
     <group name="distributedClearAllEntityCaches" send-mode="all">
diff --git a/framework/entityext/servicedef/secas.xml b/framework/entityext/servicedef/secas.xml
index 9f8ca5e..9f9fe03 100644
--- a/framework/entityext/servicedef/secas.xml
+++ b/framework/entityext/servicedef/secas.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
 
     <!-- cleanSyncRemoveInfo ECA, should also run on a schedule, like once a day or something -->
     <eca service="runEntitySync" event="return">
diff --git a/framework/entityext/servicedef/services.xml b/framework/entityext/servicedef/services.xml
index c914728..8d244fd 100644
--- a/framework/entityext/servicedef/services.xml
+++ b/framework/entityext/servicedef/services.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Entity Extension Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/framework/entityext/servicedef/services_group.xml b/framework/entityext/servicedef/services_group.xml
index 8642224..cb251b9 100644
--- a/framework/entityext/servicedef/services_group.xml
+++ b/framework/entityext/servicedef/services_group.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Entity Group Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/framework/entityext/servicedef/services_synchronization.xml b/framework/entityext/servicedef/services_synchronization.xml
index cb0f750..5239a2a 100644
--- a/framework/entityext/servicedef/services_synchronization.xml
+++ b/framework/entityext/servicedef/services_synchronization.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Entity Group Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/framework/entityext/servicedef/services_tenant.xml b/framework/entityext/servicedef/services_tenant.xml
index 8e7dbc1..e313dd5 100644
--- a/framework/entityext/servicedef/services_tenant.xml
+++ b/framework/entityext/servicedef/services_tenant.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Entity Tenant Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/framework/minilang/config/DefaultMessagesUiLabels.xml b/framework/minilang/config/DefaultMessagesUiLabels.xml
index da8af0d..0d0b49f 100644
--- a/framework/minilang/config/DefaultMessagesUiLabels.xml
+++ b/framework/minilang/config/DefaultMessagesUiLabels.xml
@@ -17,7 +17,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="check.error.prefix">
         <value xml:lang="de">Fehler: </value>
         <value xml:lang="en">Error: </value>
diff --git a/framework/minilang/config/MiniLangErrorUiLabels.xml b/framework/minilang/config/MiniLangErrorUiLabels.xml
index 8a8625c..a7109fd 100644
--- a/framework/minilang/config/MiniLangErrorUiLabels.xml
+++ b/framework/minilang/config/MiniLangErrorUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="simpleMethod.error_begin_transaction">
         <value xml:lang="de">Fehler beim Starten der Transaktion, Methode konnte nicht verarbeitet werden</value>
         <value xml:lang="en">Error trying to begin transaction, could not process method</value>
diff --git a/framework/minilang/ofbiz-component.xml b/framework/minilang/ofbiz-component.xml
index d85f55e..8f676df 100644
--- a/framework/minilang/ofbiz-component.xml
+++ b/framework/minilang/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="minilang"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
     <classpath type="dir" location="dtd"/>
diff --git a/framework/minilang/testdef/MinilangTests.xml b/framework/minilang/testdef/MinilangTests.xml
index bbada19..e342db9 100644
--- a/framework/minilang/testdef/MinilangTests.xml
+++ b/framework/minilang/testdef/MinilangTests.xml
@@ -20,7 +20,7 @@
 
 <test-suite suite-name="MinilangTests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-case case-name="MiniLangUnitTests">
         <junit-test-suite class-name="org.apache.ofbiz.minilang.test.MiniLangTests"/>
diff --git a/framework/resources/templates/Tests.xml b/framework/resources/templates/Tests.xml
index 77a8964..b25eab2 100644
--- a/framework/resources/templates/Tests.xml
+++ b/framework/resources/templates/Tests.xml
@@ -20,7 +20,7 @@ under the License.
 
 <test-suite suite-name="@component-resource-name@tests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
 
 
 </test-suite>
\ No newline at end of file
diff --git a/framework/resources/templates/UiLabels.xml b/framework/resources/templates/UiLabels.xml
index 878c5eb..b34d214 100644
--- a/framework/resources/templates/UiLabels.xml
+++ b/framework/resources/templates/UiLabels.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="@component-resource-name@Application">
         <value xml:lang="en">@component-resource-name@ Application</value>
         <value xml:lang="zh">@component-resource-name@应用程序</value>
diff --git a/framework/resources/templates/entitymodel.xml b/framework/resources/templates/entitymodel.xml
index adf5613..ff0e4fd 100644
--- a/framework/resources/templates/entitymodel.xml
+++ b/framework/resources/templates/entitymodel.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
     <!-- ========================================================= -->
     <!-- ======================== Defaults ======================= -->
     <!-- ========================================================= -->
diff --git a/framework/resources/templates/ofbiz-component.xml b/framework/resources/templates/ofbiz-component.xml
index 9e0aaa3..1adbe84 100644
--- a/framework/resources/templates/ofbiz-component.xml
+++ b/framework/resources/templates/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="@component-name@"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <!-- define resource loaders; most common is to use the component resource loader -->
     <resource-loader name="main" type="component"/>
 
diff --git a/framework/resources/templates/services.xml b/framework/resources/templates/services.xml
index 754b70a..6b744bb 100644
--- a/framework/resources/templates/services.xml
+++ b/framework/resources/templates/services.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>@component-resource-name@ Services</description>
     <vendor></vendor>
     <version>1.0</version>
diff --git a/framework/security/config/SecurityEntityLabels.xml b/framework/security/config/SecurityEntityLabels.xml
index 6cf84fb..719f944 100644
--- a/framework/security/config/SecurityEntityLabels.xml
+++ b/framework/security/config/SecurityEntityLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="SecurityGroup.description.ASSETMAINTADMIN">
         <value xml:lang="en">Asset Maintenance Admin group, has all maintenance permissions.</value>
         <value xml:lang="it">Gruppo permesso manutenzione cespiti, ha tutti i permessi di manutenzione.</value>
diff --git a/framework/security/entitydef/entitymodel.xml b/framework/security/entitydef/entitymodel.xml
index 1594447..b4cab6e 100644
--- a/framework/security/entitydef/entitymodel.xml
+++ b/framework/security/entitydef/entitymodel.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
   <!-- ========================================================= -->
   <!-- ======================== Defaults ======================= -->
   <!-- ========================================================= -->
diff --git a/framework/security/ofbiz-component.xml b/framework/security/ofbiz-component.xml
index 69c1aad..0509245 100644
--- a/framework/security/ofbiz-component.xml
+++ b/framework/security/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="security"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
     <classpath type="dir" location="dtd"/>
diff --git a/framework/service/config/ServiceErrorUiLabels.xml b/framework/service/config/ServiceErrorUiLabels.xml
index 281a077..0b6c54c 100644
--- a/framework/service/config/ServiceErrorUiLabels.xml
+++ b/framework/service/config/ServiceErrorUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="ModelService.following_required_parameter_missing">
         <value xml:lang="de">Der folgende benötigte Parameter fehlt:</value>
         <value xml:lang="en">The following required parameter is missing:</value>
diff --git a/framework/service/config/ServiceUiLabels.xml b/framework/service/config/ServiceUiLabels.xml
index 2734b94..29493be 100644
--- a/framework/service/config/ServiceUiLabels.xml
+++ b/framework/service/config/ServiceUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="EntityCreatedSuccessfully">
         <value xml:lang="en">${entityName} created successfully</value>
     </property>
diff --git a/framework/service/config/serviceengine.xml b/framework/service/config/serviceengine.xml
index 96bf1e4..e1dc683 100644
--- a/framework/service/config/serviceengine.xml
+++ b/framework/service/config/serviceengine.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-config.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-config.xsd">
 
     <service-engine name="default">
         <!-- Name of the service to use for authorization -->
diff --git a/framework/service/entitydef/entitymodel.xml b/framework/service/entitydef/entitymodel.xml
index da88e97..e4371c3 100644
--- a/framework/service/entitydef/entitymodel.xml
+++ b/framework/service/entitydef/entitymodel.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
   <!-- ========================================================= -->
   <!-- ======================== Defaults ======================= -->
   <!-- ========================================================= -->
diff --git a/framework/service/ofbiz-component.xml b/framework/service/ofbiz-component.xml
index 72f66a8..4b61450 100644
--- a/framework/service/ofbiz-component.xml
+++ b/framework/service/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="service"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
     <classpath type="dir" location="dtd"/>
diff --git a/framework/service/servicedef/secas_test_se.xml b/framework/service/servicedef/secas_test_se.xml
index 47fd884..be428bc 100644
--- a/framework/service/servicedef/secas_test_se.xml
+++ b/framework/service/servicedef/secas_test_se.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
     <eca service="testServiceEcaGlobalEventExec" event="global-commit">
         <action service="testServiceEcaGlobalEventExecOnCommit" mode="sync"/>
     </eca>
diff --git a/framework/service/servicedef/services.xml b/framework/service/servicedef/services.xml
index 6dbf3be..2ca96be 100644
--- a/framework/service/servicedef/services.xml
+++ b/framework/service/servicedef/services.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>OFBiz Service Engine Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/framework/service/servicedef/services_test_se.xml b/framework/service/servicedef/services_test_se.xml
index c5a5bb3..f5df51c 100644
--- a/framework/service/servicedef/services_test_se.xml
+++ b/framework/service/servicedef/services_test_se.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>OFBiz Service Engine Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/framework/service/testdef/servicetests.xml b/framework/service/testdef/servicetests.xml
index 2f9b76f..7f01d70 100644
--- a/framework/service/testdef/servicetests.xml
+++ b/framework/service/testdef/servicetests.xml
@@ -20,7 +20,7 @@ under the License.
 
 <test-suite suite-name="servicetests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
     <test-case case-name="service-tests"><junit-test-suite class-name="org.apache.ofbiz.service.test.ServiceEngineTests"/></test-case>
     <!-- <test-case case-name="service-soap-tests"><junit-test-suite class-name="org.apache.ofbiz.service.test.ServiceSOAPTests"/></test-case> -->
     <test-case case-name="service-entity-auto-tests"><junit-test-suite class-name="org.apache.ofbiz.service.test.ServiceEntityAutoTests"/></test-case>
diff --git a/framework/testtools/ofbiz-component.xml b/framework/testtools/ofbiz-component.xml
index e1e0dfd..d37f6fd 100644
--- a/framework/testtools/ofbiz-component.xml
+++ b/framework/testtools/ofbiz-component.xml
@@ -20,7 +20,7 @@
 
 <ofbiz-component name="testtools"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <!-- define resource loaders; most common is to use the component resource loader -->
     <resource-loader name="main" type="component"/>
 
diff --git a/framework/testtools/servicedef/services.xml b/framework/testtools/servicedef/services.xml
index 44e653d..f12483c 100644
--- a/framework/testtools/servicedef/services.xml
+++ b/framework/testtools/servicedef/services.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>Test Tool Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/framework/webapp/config/WebappEntityLabels.xml b/framework/webapp/config/WebappEntityLabels.xml
index c2d02b6..d3a4a75 100644
--- a/framework/webapp/config/WebappEntityLabels.xml
+++ b/framework/webapp/config/WebappEntityLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="ServerHitType.description.ENTITY">
         <value xml:lang="de">Entität</value>
         <value xml:lang="en">Entity</value>
diff --git a/framework/webapp/config/WebappUiLabels.xml b/framework/webapp/config/WebappUiLabels.xml
index 474facf..e6c29c3 100644
--- a/framework/webapp/config/WebappUiLabels.xml
+++ b/framework/webapp/config/WebappUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="coreEvents.delegator_not_passed">
         <value xml:lang="de">Benötigter Parameter 'delegator' fehlt.</value>
         <value xml:lang="en">Required parameter 'delegator' not passed.</value>
diff --git a/framework/webapp/entitydef/entitygroup.xml b/framework/webapp/entitydef/entitygroup.xml
index e9ba4eb..aac1a61 100644
--- a/framework/webapp/entitydef/entitygroup.xml
+++ b/framework/webapp/entitydef/entitygroup.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitygroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitygroup.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitygroup.xsd">
 
     <entity-group group="org.apache.ofbiz.stats" entity="BrowserType"/>
     <entity-group group="org.apache.ofbiz.stats" entity="PlatformType"/>
diff --git a/framework/webapp/entitydef/entitymodel.xml b/framework/webapp/entitydef/entitymodel.xml
index 9ed94de..4510fd6 100644
--- a/framework/webapp/entitydef/entitymodel.xml
+++ b/framework/webapp/entitydef/entitymodel.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+    xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
   <!-- ========================================================= -->
   <!-- ======================== Defaults ======================= -->
   <!-- ========================================================= -->
diff --git a/framework/webapp/ofbiz-component.xml b/framework/webapp/ofbiz-component.xml
index 5276f56..cd7b52c 100644
--- a/framework/webapp/ofbiz-component.xml
+++ b/framework/webapp/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="webapp"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
 
     <resource-loader name="main" type="component"/>
 
diff --git a/framework/webapp/testdef/webapptests.xml b/framework/webapp/testdef/webapptests.xml
index 8761e53..bc37508 100644
--- a/framework/webapp/testdef/webapptests.xml
+++ b/framework/webapp/testdef/webapptests.xml
@@ -19,7 +19,7 @@
 
 <test-suite suite-name="webapptests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-case case-name="webapp-tests">
         <junit-test-suite class-name="org.apache.ofbiz.webapp.test.XmlRpcTests"/>
diff --git a/framework/webtools/config/WebtoolsErrorUiLabels.xml b/framework/webtools/config/WebtoolsErrorUiLabels.xml
index 665a0ca..fb75be2 100644
--- a/framework/webtools/config/WebtoolsErrorUiLabels.xml
+++ b/framework/webtools/config/WebtoolsErrorUiLabels.xml
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="foundgenericWebEvent.conversion_failed">
         <value xml:lang="en">conversion failed</value>
         <value xml:lang="fr">La conversion a échoué. "${fval}" est erroné</value>
diff --git a/framework/webtools/config/WebtoolsUiLabels.xml b/framework/webtools/config/WebtoolsUiLabels.xml
index 5a7bd2e..02cb698 100644
--- a/framework/webtools/config/WebtoolsUiLabels.xml
+++ b/framework/webtools/config/WebtoolsUiLabels.xml
@@ -17,7 +17,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="ConnectionPoolStatus">
         <value xml:lang="en">Connection Pool Status</value>
         <value xml:lang="fr">État du pool de connexions</value>
diff --git a/framework/webtools/ofbiz-component.xml b/framework/webtools/ofbiz-component.xml
index 662e606..a542923 100644
--- a/framework/webtools/ofbiz-component.xml
+++ b/framework/webtools/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="webtools"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
     
diff --git a/framework/webtools/servicedef/services.xml b/framework/webtools/servicedef/services.xml
index 11be41c..8ab0bea 100644
--- a/framework/webtools/servicedef/services.xml
+++ b/framework/webtools/servicedef/services.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
     <description>OFBiz WebTools Services</description>
     <vendor>OFBiz</vendor>
     <version>1.0</version>
diff --git a/framework/widget/config/conditionalUiLabels.xml b/framework/widget/config/conditionalUiLabels.xml
index 77fa35e..72563d1 100644
--- a/framework/widget/config/conditionalUiLabels.xml
+++ b/framework/widget/config/conditionalUiLabels.xml
@@ -17,7 +17,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="begins_with">
         <value xml:lang="ar">يبدأ ب</value>
         <value xml:lang="cs">Začíná</value>
diff --git a/framework/widget/ofbiz-component.xml b/framework/widget/ofbiz-component.xml
index b5ad948..0bc991b 100644
--- a/framework/widget/ofbiz-component.xml
+++ b/framework/widget/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="widget"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
     <classpath type="dir" location="dtd"/>
diff --git a/framework/widget/testdef/widgettests.xml b/framework/widget/testdef/widgettests.xml
index 43c2298..1668a15 100644
--- a/framework/widget/testdef/widgettests.xml
+++ b/framework/widget/testdef/widgettests.xml
@@ -19,7 +19,7 @@
 
 <test-suite suite-name="widgettests"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-case case-name="widget-tests">
         <junit-test-suite class-name="org.apache.ofbiz.widget.test.WidgetMacroLibraryTests"/>
diff --git a/themes/bluelight/ofbiz-component.xml b/themes/bluelight/ofbiz-component.xml
index 08f4d0e..bfcc399 100644
--- a/themes/bluelight/ofbiz-component.xml
+++ b/themes/bluelight/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="bluelight"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <!-- define resource loaders; most common is to use the component resource loader -->
     <resource-loader name="main" type="component"/>
 
diff --git a/themes/common/config/CommonThemeUiLabels.xml b/themes/common/config/CommonThemeUiLabels.xml
index 0138dca..88abb50 100644
--- a/themes/common/config/CommonThemeUiLabels.xml
+++ b/themes/common/config/CommonThemeUiLabels.xml
@@ -17,7 +17,7 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
     <property key="CommonThemeVisualThemeDescription">
         <value xml:lang="en">Common theme on techno html5/css/jquery</value>
         <value xml:lang="fr">Theme principal sur la techno html5/css/jquery</value>
diff --git a/themes/common/ofbiz-component.xml b/themes/common/ofbiz-component.xml
index 50fe497..75a72d5 100644
--- a/themes/common/ofbiz-component.xml
+++ b/themes/common/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="common-theme"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <!-- define resource loaders; most common is to use the component resource loader -->
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
diff --git a/themes/flatgrey/ofbiz-component.xml b/themes/flatgrey/ofbiz-component.xml
index 42f8f10..72a682f 100644
--- a/themes/flatgrey/ofbiz-component.xml
+++ b/themes/flatgrey/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="flatgrey"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <!-- define resource loaders; most common is to use the component resource loader -->
     <resource-loader name="main" type="component"/>
 
diff --git a/themes/rainbowstone/ofbiz-component.xml b/themes/rainbowstone/ofbiz-component.xml
index 52f3832..f50a826 100644
--- a/themes/rainbowstone/ofbiz-component.xml
+++ b/themes/rainbowstone/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="rainbowstone"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <!-- define resource loaders; most common is to use the component resource loader -->
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
diff --git a/themes/tomahawk/ofbiz-component.xml b/themes/tomahawk/ofbiz-component.xml
index f83146f..b319e8b 100644
--- a/themes/tomahawk/ofbiz-component.xml
+++ b/themes/tomahawk/ofbiz-component.xml
@@ -20,7 +20,7 @@ under the License.
 
 <ofbiz-component name="tomahawk"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+        xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <!-- define resource loaders; most common is to use the component resource loader -->
     <resource-loader name="main" type="component"/>