diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/util/MetadataHelperTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/util/MetadataHelperTest.java
index b5c8c30f74..8ce2ab03ea 100644
--- a/jbt/src/test/java/org/hibernate/tool/orm/jbt/util/MetadataHelperTest.java
+++ b/jbt/src/test/java/org/hibernate/tool/orm/jbt/util/MetadataHelperTest.java
@@ -88,7 +88,7 @@ private static class Foo {
 	private static final String TEST_HBM_XML_STRING =
 			"<!DOCTYPE hibernate-mapping PUBLIC" +
 			"		'-//Hibernate/Hibernate Mapping DTD 3.0//EN'" +
-			"		'http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd'>" +
+			"		'https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd'>" +
 			"<hibernate-mapping package='org.hibernate.tool.orm.jbt.util'>" +
 			"  <class name='MetadataHelperTest$Foo'>" + 
 			"    <id name='id'/>" +
diff --git a/orm/src/main/resources/hbm/generalhbm.hbm.ftl b/orm/src/main/resources/hbm/generalhbm.hbm.ftl
index bf73afd337..5d9d8e982c 100644
--- a/orm/src/main/resources/hbm/generalhbm.hbm.ftl
+++ b/orm/src/main/resources/hbm/generalhbm.hbm.ftl
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>	
 <!-- 
diff --git a/orm/src/main/resources/hbm/hibernate-mapping.hbm.ftl b/orm/src/main/resources/hbm/hibernate-mapping.hbm.ftl
index 8c4891523a..f7b00586c4 100644
--- a/orm/src/main/resources/hbm/hibernate-mapping.hbm.ftl
+++ b/orm/src/main/resources/hbm/hibernate-mapping.hbm.ftl
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- Generated ${date} by Hibernate Tools ${version} -->
 <#if hmgs?exists && hmgs.hasNonDefaultSettings()>
diff --git a/test/common/src/main/resources/org/hibernate/tool/ant/AntHibernateTool/TopDown.hbm.xml b/test/common/src/main/resources/org/hibernate/tool/ant/AntHibernateTool/TopDown.hbm.xml
index 7423324ed5..767bd5de29 100644
--- a/test/common/src/main/resources/org/hibernate/tool/ant/AntHibernateTool/TopDown.hbm.xml
+++ b/test/common/src/main/resources/org/hibernate/tool/ant/AntHibernateTool/TopDown.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
 
 	<class name="org.hibernate.tool.hbm2x.ant.TopDown">
diff --git a/test/common/src/main/resources/org/hibernate/tool/ant/GenericExport/TopDown.hbm.xml b/test/common/src/main/resources/org/hibernate/tool/ant/GenericExport/TopDown.hbm.xml
index 7423324ed5..767bd5de29 100644
--- a/test/common/src/main/resources/org/hibernate/tool/ant/GenericExport/TopDown.hbm.xml
+++ b/test/common/src/main/resources/org/hibernate/tool/ant/GenericExport/TopDown.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
 
 	<class name="org.hibernate.tool.hbm2x.ant.TopDown">
diff --git a/test/common/src/main/resources/org/hibernate/tool/ant/Hbm2JavaConfiguration/SomeClass.hbm.xml b/test/common/src/main/resources/org/hibernate/tool/ant/Hbm2JavaConfiguration/SomeClass.hbm.xml
index 6f660da374..a18a73271f 100644
--- a/test/common/src/main/resources/org/hibernate/tool/ant/Hbm2JavaConfiguration/SomeClass.hbm.xml
+++ b/test/common/src/main/resources/org/hibernate/tool/ant/Hbm2JavaConfiguration/SomeClass.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
 
 	<class name="SomeClass">
diff --git a/test/common/src/main/resources/org/hibernate/tool/ant/Hbm2JavaEJB3Configuration/SomeClass.hbm.xml b/test/common/src/main/resources/org/hibernate/tool/ant/Hbm2JavaEJB3Configuration/SomeClass.hbm.xml
index 6f660da374..a18a73271f 100644
--- a/test/common/src/main/resources/org/hibernate/tool/ant/Hbm2JavaEJB3Configuration/SomeClass.hbm.xml
+++ b/test/common/src/main/resources/org/hibernate/tool/ant/Hbm2JavaEJB3Configuration/SomeClass.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
 
 	<class name="SomeClass">
diff --git a/test/common/src/main/resources/org/hibernate/tool/ant/HbmLint/Column.hbm.xml b/test/common/src/main/resources/org/hibernate/tool/ant/HbmLint/Column.hbm.xml
index 658bef462f..54b5df61c2 100644
--- a/test/common/src/main/resources/org/hibernate/tool/ant/HbmLint/Column.hbm.xml
+++ b/test/common/src/main/resources/org/hibernate/tool/ant/HbmLint/Column.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbm2x.hbm2hbmxml">
 <!-- 
diff --git a/test/common/src/main/resources/org/hibernate/tool/ant/HbmLint/SchemaIssues.hbm.xml b/test/common/src/main/resources/org/hibernate/tool/ant/HbmLint/SchemaIssues.hbm.xml
index 4549905fcc..14bd908b64 100644
--- a/test/common/src/main/resources/org/hibernate/tool/ant/HbmLint/SchemaIssues.hbm.xml
+++ b/test/common/src/main/resources/org/hibernate/tool/ant/HbmLint/SchemaIssues.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbmlint">
 
diff --git a/test/common/src/main/resources/org/hibernate/tool/ant/Properties/SomeClass.hbm.xml b/test/common/src/main/resources/org/hibernate/tool/ant/Properties/SomeClass.hbm.xml
index 6f660da374..a18a73271f 100644
--- a/test/common/src/main/resources/org/hibernate/tool/ant/Properties/SomeClass.hbm.xml
+++ b/test/common/src/main/resources/org/hibernate/tool/ant/Properties/SomeClass.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
 
 	<class name="SomeClass">
diff --git a/test/common/src/main/resources/org/hibernate/tool/ant/Query/query.hbm.xml b/test/common/src/main/resources/org/hibernate/tool/ant/Query/query.hbm.xml
index 32ca84e2fd..26444e3fc9 100644
--- a/test/common/src/main/resources/org/hibernate/tool/ant/Query/query.hbm.xml
+++ b/test/common/src/main/resources/org/hibernate/tool/ant/Query/query.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.ant.Query">
 <!-- 
diff --git a/test/common/src/main/resources/org/hibernate/tool/ant/SchemaExportWarning/TopDown.hbm.xml b/test/common/src/main/resources/org/hibernate/tool/ant/SchemaExportWarning/TopDown.hbm.xml
index 7423324ed5..767bd5de29 100644
--- a/test/common/src/main/resources/org/hibernate/tool/ant/SchemaExportWarning/TopDown.hbm.xml
+++ b/test/common/src/main/resources/org/hibernate/tool/ant/SchemaExportWarning/TopDown.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
 
 	<class name="org.hibernate.tool.hbm2x.ant.TopDown">
diff --git a/test/common/src/main/resources/org/hibernate/tool/ant/SchemaUpdateWarning/TopDown.hbm.xml b/test/common/src/main/resources/org/hibernate/tool/ant/SchemaUpdateWarning/TopDown.hbm.xml
index 7423324ed5..767bd5de29 100644
--- a/test/common/src/main/resources/org/hibernate/tool/ant/SchemaUpdateWarning/TopDown.hbm.xml
+++ b/test/common/src/main/resources/org/hibernate/tool/ant/SchemaUpdateWarning/TopDown.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
 
 	<class name="org.hibernate.tool.hbm2x.ant.TopDown">
diff --git a/test/common/src/main/resources/org/hibernate/tool/hbm2x/query/QueryExporterTest/UserGroup.hbm.xml b/test/common/src/main/resources/org/hibernate/tool/hbm2x/query/QueryExporterTest/UserGroup.hbm.xml
index 3c3c338758..b5f17e22fe 100644
--- a/test/common/src/main/resources/org/hibernate/tool/hbm2x/query/QueryExporterTest/UserGroup.hbm.xml
+++ b/test/common/src/main/resources/org/hibernate/tool/hbm2x/query/QueryExporterTest/UserGroup.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/common/src/main/resources/org/hibernate/tool/hbmlint/HbmLintTest/BrokenLazy.hbm.xml b/test/common/src/main/resources/org/hibernate/tool/hbmlint/HbmLintTest/BrokenLazy.hbm.xml
index 2d27f858f0..ef0768d8dc 100644
--- a/test/common/src/main/resources/org/hibernate/tool/hbmlint/HbmLintTest/BrokenLazy.hbm.xml
+++ b/test/common/src/main/resources/org/hibernate/tool/hbmlint/HbmLintTest/BrokenLazy.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbmlint.HbmLintTest">
 
diff --git a/test/common/src/main/resources/org/hibernate/tool/hbmlint/HbmLintTest/CachingSettings.hbm.xml b/test/common/src/main/resources/org/hibernate/tool/hbmlint/HbmLintTest/CachingSettings.hbm.xml
index 81efcf9a3c..e13e1da225 100644
--- a/test/common/src/main/resources/org/hibernate/tool/hbmlint/HbmLintTest/CachingSettings.hbm.xml
+++ b/test/common/src/main/resources/org/hibernate/tool/hbmlint/HbmLintTest/CachingSettings.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbmlint.HbmLintTest">
 
diff --git a/test/common/src/main/resources/org/hibernate/tool/hbmlint/HbmLintTest/IdentifierIssues.hbm.xml b/test/common/src/main/resources/org/hibernate/tool/hbmlint/HbmLintTest/IdentifierIssues.hbm.xml
index 98fc8c91e2..58934c3774 100644
--- a/test/common/src/main/resources/org/hibernate/tool/hbmlint/HbmLintTest/IdentifierIssues.hbm.xml
+++ b/test/common/src/main/resources/org/hibernate/tool/hbmlint/HbmLintTest/IdentifierIssues.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbmlint.HbmLintTest">
 
diff --git a/test/common/src/main/resources/org/hibernate/tool/hbmlint/SchemaAnalyzer/SchemaIssues.hbm.xml b/test/common/src/main/resources/org/hibernate/tool/hbmlint/SchemaAnalyzer/SchemaIssues.hbm.xml
index 5495d94e7c..bab2b86cc8 100644
--- a/test/common/src/main/resources/org/hibernate/tool/hbmlint/SchemaAnalyzer/SchemaIssues.hbm.xml
+++ b/test/common/src/main/resources/org/hibernate/tool/hbmlint/SchemaAnalyzer/SchemaIssues.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbmlint">
 
diff --git a/test/common/src/main/resources/org/hibernate/tool/stat/Statistics/UserGroup.hbm.xml b/test/common/src/main/resources/org/hibernate/tool/stat/Statistics/UserGroup.hbm.xml
index 235fce7bb8..721aa41ed7 100644
--- a/test/common/src/main/resources/org/hibernate/tool/stat/Statistics/UserGroup.hbm.xml
+++ b/test/common/src/main/resources/org/hibernate/tool/stat/Statistics/UserGroup.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
      
diff --git a/test/mysql/src/test/resources/org/hibernate/tool/hbmlint/SchemaAnalyzer/SchemaIssues.hbm.xml b/test/mysql/src/test/resources/org/hibernate/tool/hbmlint/SchemaAnalyzer/SchemaIssues.hbm.xml
index 67c8779e6e..66c5b1f035 100644
--- a/test/mysql/src/test/resources/org/hibernate/tool/hbmlint/SchemaAnalyzer/SchemaIssues.hbm.xml
+++ b/test/mysql/src/test/resources/org/hibernate/tool/hbmlint/SchemaAnalyzer/SchemaIssues.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbmlint">
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/ant/Exception/TopDown.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/ant/Exception/TopDown.hbm.xml
index df2640ea90..768dd54b2e 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/ant/Exception/TopDown.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/ant/Exception/TopDown.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
 
 	<class name="org.hibernate.tool.hbm2x.ant.TopDown">
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/ant/NoConnInfoExport/TopDown.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/ant/NoConnInfoExport/TopDown.hbm.xml
index df2640ea90..768dd54b2e 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/ant/NoConnInfoExport/TopDown.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/ant/NoConnInfoExport/TopDown.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
 
 	<class name="org.hibernate.tool.hbm2x.ant.TopDown">
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/Customer.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/Customer.hbm.xml
index b91a4145b9..91bb6ea031 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/Customer.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/Customer.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 	
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/DependentValue.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/DependentValue.hbm.xml
index 777261f5ba..2b043bd7e9 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/DependentValue.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/DependentValue.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
     "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-    "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+    "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
 
 <!-- Mapping for dependentValue bug - HBX-953 -->
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/HelloWorld.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/HelloWorld.hbm.xml
index 8c4356fb7e..1154536904 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/HelloWorld.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/HelloWorld.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/LineItem.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/LineItem.hbm.xml
index 590135d78e..d5d130f235 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/LineItem.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/LineItem.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/Order.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/Order.hbm.xml
index ef0757f0f8..2dd600ad3c 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/Order.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/Order.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbm2x">
 <!-- 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/Product.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/Product.hbm.xml
index bf0274671f..8aa34a6c84 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/Product.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/Product.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbm2x">
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/UnionSubclass.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/UnionSubclass.hbm.xml
index 917d18839f..95b74ef421 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/UnionSubclass.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/DocExporterTest/UnionSubclass.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/GenericExporterTest/Article.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/GenericExporterTest/Article.hbm.xml
index 773e9633cd..d0a6f60e72 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/GenericExporterTest/Article.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/GenericExporterTest/Article.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/GenericExporterTest/Author.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/GenericExporterTest/Author.hbm.xml
index 6fbbcae14e..8bf66d8a33 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/GenericExporterTest/Author.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/GenericExporterTest/Author.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/GenericExporterTest/HelloWorld.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/GenericExporterTest/HelloWorld.hbm.xml
index 8c4356fb7e..1154536904 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/GenericExporterTest/HelloWorld.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/GenericExporterTest/HelloWorld.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/HashcodeEqualsTest/HashEquals.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/HashcodeEqualsTest/HashEquals.hbm.xml
index 4a87308569..2632580dcc 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/HashcodeEqualsTest/HashEquals.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/HashcodeEqualsTest/HashEquals.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 	
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2CfgTest/HelloWorld.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2CfgTest/HelloWorld.hbm.xml
index 8c4356fb7e..1154536904 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2CfgTest/HelloWorld.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2CfgTest/HelloWorld.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2DaoTest/Article.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2DaoTest/Article.hbm.xml
index 773e9633cd..d0a6f60e72 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2DaoTest/Article.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2DaoTest/Article.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2DaoTest/Author.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2DaoTest/Author.hbm.xml
index 6fbbcae14e..8bf66d8a33 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2DaoTest/Author.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2DaoTest/Author.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2EJBDaoTest/Article.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2EJBDaoTest/Article.hbm.xml
index 773e9633cd..d0a6f60e72 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2EJBDaoTest/Article.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2EJBDaoTest/Article.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2EJBDaoTest/Author.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2EJBDaoTest/Author.hbm.xml
index 6fbbcae14e..8bf66d8a33 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2EJBDaoTest/Author.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2EJBDaoTest/Author.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2HibernateDAOTest/Article.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2HibernateDAOTest/Article.hbm.xml
index f6b971113d..cf0518b46f 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2HibernateDAOTest/Article.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2HibernateDAOTest/Article.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2HibernateDAOTest/Author.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2HibernateDAOTest/Author.hbm.xml
index bd8efbc5d6..2d29a5eeb3 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2HibernateDAOTest/Author.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2HibernateDAOTest/Author.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaConstructorTest/Constructors.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaConstructorTest/Constructors.hbm.xml
index ccc0bf2e9a..869ab9ad5d 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaConstructorTest/Constructors.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaConstructorTest/Constructors.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaDidirectionalIndexedCollectionMappingTest/GenericModel.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaDidirectionalIndexedCollectionMappingTest/GenericModel.hbm.xml
index 1fa2f0be16..272532c69a 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaDidirectionalIndexedCollectionMappingTest/GenericModel.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaDidirectionalIndexedCollectionMappingTest/GenericModel.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Article.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Article.hbm.xml
index d8e7735f38..0a482aab98 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Article.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Article.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Author.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Author.hbm.xml
index 75efcf0c79..ea3a12f78b 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Author.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Author.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Passenger.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Passenger.hbm.xml
index dde753c8d5..72c6b56207 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Passenger.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Passenger.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbm2x.Hbm2JavaEjb3Test">
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Train.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Train.hbm.xml
index 952b427a73..0c3bde51aa 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Train.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Train.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbm2x.Hbm2JavaEjb3Test">
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Article.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Article.hbm.xml
index 9a68082f9a..e9ebd5b664 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Article.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Article.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Author.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Author.hbm.xml
index 5965f55f57..acfbda7574 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Author.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Author.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Passenger.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Passenger.hbm.xml
index 520a0d2cc1..806c0aa2fd 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Passenger.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Passenger.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbm2x.Hbm2JavaInitializationTest">
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Train.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Train.hbm.xml
index dc0a988503..8d96f024cc 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Train.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaInitializationTest/Train.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbm2x.Hbm2JavaInitializationTest">
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Customer.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Customer.hbm.xml
index a0b4ec90bc..2f7b495534 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Customer.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Customer.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 	
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/HelloWorld.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/HelloWorld.hbm.xml
index c999515697..e27976346f 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/HelloWorld.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/HelloWorld.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/LineItem.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/LineItem.hbm.xml
index 81655958fd..a8bd8511b6 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/LineItem.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/LineItem.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Order.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Order.hbm.xml
index 753af1d29e..d3a3e1bf36 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Order.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Order.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbm2x.Hbm2JavaTest">
 <!-- 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Passenger.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Passenger.hbm.xml
index c18628f258..72f6c5e2b8 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Passenger.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Passenger.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbm2x.Hbm2JavaTest">
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Product.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Product.hbm.xml
index 85a13d7fd7..e77ea2f095 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Product.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Product.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbm2x.Hbm2JavaTest">
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Train.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Train.hbm.xml
index 55f2cbc135..1b3b7fd96a 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Train.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/Hbm2JavaTest/Train.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbm2x.Hbm2JavaTest">
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/Customer.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/Customer.hbm.xml
index 38653807d2..a62e6a4cff 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/Customer.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/Customer.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 	
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/HelloWorld.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/HelloWorld.hbm.xml
index c999515697..e27976346f 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/HelloWorld.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/HelloWorld.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/LineItem.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/LineItem.hbm.xml
index 24758888d0..73ec317252 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/LineItem.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/LineItem.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/Order.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/Order.hbm.xml
index d2ab096875..f7e99ae31b 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/Order.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/Order.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbm2x">
 <!-- 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/Product.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/Product.hbm.xml
index 4c9ea37f27..05f1a63ac5 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/Product.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/OtherCfg2HbmTest/Product.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbm2x">
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/PropertiesTest/Properties.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/PropertiesTest/Properties.hbm.xml
index e920773905..5c64f5ed02 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/PropertiesTest/Properties.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/PropertiesTest/Properties.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/AbstractTest/Car.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/AbstractTest/Car.hbm.xml
index 5ef3000e29..6ff3ac3077 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/AbstractTest/Car.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/AbstractTest/Car.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 	
 <hibernate-mapping package="org.hibernate.tool.hbm2x.hbm2hbmxml.AbstractTest">
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/BackrefTest/Car.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/BackrefTest/Car.hbm.xml
index a79f26cbd2..1960460c8b 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/BackrefTest/Car.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/BackrefTest/Car.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 	
 <hibernate-mapping package="org.hibernate.tool.hbm2x.hbm2hbmxml.BackrefTest">
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/CompositeElementTest/Glarch.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/CompositeElementTest/Glarch.hbm.xml
index bd478a49a0..894039d471 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/CompositeElementTest/Glarch.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/CompositeElementTest/Glarch.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false" 
 	package="org.hibernate.tool.hbm2x.hbm2hbmxml.CompositeElementTest">
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/DynamicComponentTest/Glarch.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/DynamicComponentTest/Glarch.hbm.xml
index 0255df88d0..703477f4c0 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/DynamicComponentTest/Glarch.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/DynamicComponentTest/Glarch.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false" 
 	package="org.hibernate.tool.hbm2x.hbm2hbmxml.DynamicComponentTest">
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/Basic.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/Basic.hbm.xml
index 16f2a4e978..329f804fd8 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/Basic.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/Basic.hbm.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbm2x.hbm2hbmxml.Hbm2HbmXmlTest">
-<!-- 
+<!--
   This mapping demonstrates basic attributes of the mapping document
 
-     (1) Simple id and properties        
+     (1) Simple id and properties
      (2) Id generation with no arguments.
 -->
     <class name="Basic" table="`bas-ic`">
@@ -24,24 +24,24 @@
     			<param name="column">next_hi_value</param>
     		</generator>
     	</id>
-    	
-    	<property name="description" 
-    		not-null="true" 
+
+    	<property name="description"
+    		not-null="true"
     		length="200"
     		type="string">
     		  <meta attribute="property-desc" inherit="false">description</meta>
     		</property>
-    		
+
     	<property name="price" length="3" type="big_decimal" />
-    	
+
     	<property name="numberAvailable" type="int" column="`number-Available`"/>
-    	
+
     	<set name="aSet" cascade="delete, update">
-    	 <meta attribute="set-desc">anotherone</meta>    	 
+    	 <meta attribute="set-desc">anotherone</meta>
     	 <key/>
     	 <one-to-many class="Basic"/>
     	</set>
-    	
+
 	</class>
 
 </hibernate-mapping>
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicCompositeId.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicCompositeId.hbm.xml
index a84fb49183..61302ff3d6 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicCompositeId.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicCompositeId.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicGlobals.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicGlobals.hbm.xml
index 5e8a61a6d5..61a7a0db62 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicGlobals.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicGlobals.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping 
 	package="org.hibernate.tool.hbm2x.hbm2hbmxml.Hbm2HbmXmlTest"
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/ClassFullAttribute.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/ClassFullAttribute.hbm.xml
index 67782d3204..de4a5c7f8f 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/ClassFullAttribute.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/ClassFullAttribute.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbm2x.hbm2hbmxml.Hbm2HbmXmlTest">
 <!-- 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/IdBagTest/UserGroup.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/IdBagTest/UserGroup.hbm.xml
index 29787e865e..0164fe40ba 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/IdBagTest/UserGroup.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/IdBagTest/UserGroup.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/InheritanceTest/Aliens.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/InheritanceTest/Aliens.hbm.xml
index fd1d9c5f1c..5e61e1e6f4 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/InheritanceTest/Aliens.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/InheritanceTest/Aliens.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!-- 
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/ListArrayTest/Glarch.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/ListArrayTest/Glarch.hbm.xml
index ff410de58f..a58fd91e14 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/ListArrayTest/Glarch.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/ListArrayTest/Glarch.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false" 
 	package="org.hibernate.tool.hbm2x.hbm2hbmxml.ListArrayTest">
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/ManyToManyTest/UserGroup.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/ManyToManyTest/UserGroup.hbm.xml
index 9e6bae762d..c17fcaa406 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/ManyToManyTest/UserGroup.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/ManyToManyTest/UserGroup.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!--
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/Person.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/Person.hbm.xml
index c279b73995..a32f0f4b64 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/Person.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/Person.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC
       "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-          "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+          "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbm2x.hbm2hbmxml.MapAndAnyTest">
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/Properties.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/Properties.hbm.xml
index 93589770aa..4a3c2ee60f 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/Properties.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/Properties.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC
         "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+        "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbm2x.hbm2hbmxml.MapAndAnyTest">
 
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/OneToOneTest/PersonAddressOneToOnePrimaryKey.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/OneToOneTest/PersonAddressOneToOnePrimaryKey.hbm.xml
index a9f8cf2b97..1d9dd0fbdd 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/OneToOneTest/PersonAddressOneToOnePrimaryKey.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/OneToOneTest/PersonAddressOneToOnePrimaryKey.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping 
 	package="org.hibernate.tool.hbm2x.hbm2hbmxml.OneToOneTest">
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/SetElementTest/Search.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/SetElementTest/Search.hbm.xml
index c1e9209050..0053e91228 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/SetElementTest/Search.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/SetElementTest/Search.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <!--
   
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/TypeParamsTest/Order.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/TypeParamsTest/Order.hbm.xml
index ff4c4a7bfd..4d254af369 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/TypeParamsTest/Order.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/hbm2x/hbm2hbmxml/TypeParamsTest/Order.hbm.xml
@@ -19,7 +19,7 @@
   ~ limitations under the License.
   -->
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-                                   "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+                                   "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <!-- Generated 17.04.2009 10:41:19 by Hibernate Tools 3.2.4.GA -->
 <hibernate-mapping>
  <class name="org.hibernate.tool.hbm2x.hbm2hbmxml.TypeParamsTest.Order" table="ORDERS">
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/City.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/City.hbm.xml
index 856c645c75..912a538be2 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/City.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/City.hbm.xml
@@ -19,7 +19,7 @@
   ~ limitations under the License.
   -->
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-          "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+          "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping package="org.hibernate.tool.ide.completion.ModelCompletion">
     
     <class name="City" table="hc_city" abstract="true">
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/Product.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/Product.hbm.xml
index 15fa04a68a..a2870a0c40 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/Product.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/Product.hbm.xml
@@ -19,7 +19,7 @@
   ~ limitations under the License.
   -->
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-          "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+          "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping package="org.hibernate.tool.ide.completion.ModelCompletion">
     
     <import class="java.lang.Object" rename="Universe"/>
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/ProductOwnerAddress.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/ProductOwnerAddress.hbm.xml
index 2153e46bf9..d92284e914 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/ProductOwnerAddress.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/ProductOwnerAddress.hbm.xml
@@ -19,7 +19,7 @@
   ~ limitations under the License.
   -->
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-          "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+          "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping package="org.hibernate.tool.ide.completion.ModelCompletion">
     
     <class name="ProductOwnerAddress" table="hc_product_owner_address">
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/Store.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/Store.hbm.xml
index 57ef3c7d89..338c7bdd06 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/Store.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/Store.hbm.xml
@@ -19,7 +19,7 @@
   ~ limitations under the License.
   -->
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-          "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+          "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping package="org.hibernate.tool.ide.completion.ModelCompletion">
     
     <class name="Store" table="hc_store">
diff --git a/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/StoreCity.hbm.xml b/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/StoreCity.hbm.xml
index e21ffe69e4..10e6c75fa2 100644
--- a/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/StoreCity.hbm.xml
+++ b/test/nodb/src/test/resources/org/hibernate/tool/ide/completion/ModelCompletion/StoreCity.hbm.xml
@@ -19,7 +19,7 @@
   ~ limitations under the License.
   -->
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-          "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+          "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping package="org.hibernate.tool.ide.completion.ModelCompletion">
     
     <subclass name="StoreCity" extends="City" discriminator-value="sc">
diff --git a/test/oracle/src/test/resources/org/hibernate/tool/hbmlint/SchemaAnalyzer/SchemaIssues.hbm.xml b/test/oracle/src/test/resources/org/hibernate/tool/hbmlint/SchemaAnalyzer/SchemaIssues.hbm.xml
index 84d9e8289c..a31c8dcc3e 100644
--- a/test/oracle/src/test/resources/org/hibernate/tool/hbmlint/SchemaAnalyzer/SchemaIssues.hbm.xml
+++ b/test/oracle/src/test/resources/org/hibernate/tool/hbmlint/SchemaAnalyzer/SchemaIssues.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping package="org.hibernate.tool.hbmlint">
 
diff --git a/test/utils/src/test/resources/org/hibernate/tools/test/util/HelloWorld.hbm.xml b/test/utils/src/test/resources/org/hibernate/tools/test/util/HelloWorld.hbm.xml
index aae3f88b47..27917869c7 100644
--- a/test/utils/src/test/resources/org/hibernate/tools/test/util/HelloWorld.hbm.xml
+++ b/test/utils/src/test/resources/org/hibernate/tools/test/util/HelloWorld.hbm.xml
@@ -20,7 +20,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC 
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>