Merge remote-tracking branch 'origin/master' into V5

sanluan · Apr 28, 2024 · 7dfd5f9 · 7dfd5f9
2 parents 8ef0fad + a6806be
commit 7dfd5f9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/publiccms-parent/build.gradle b/publiccms-parent/build.gradle
@@ -23,7 +23,7 @@ subprojects {
     apply plugin: "eclipse-wtp"
 
     group = "com.publiccms"
-    version = "V5.202302.e"
+    version = "V5.202302.f"
 
     test.enabled = false
 

diff --git a/publiccms-parent/pom.xml b/publiccms-parent/pom.xml
@@ -20,7 +20,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <version.publiccms>V5.202302.e</version.publiccms>
+        <version.publiccms>V5.202302.f</version.publiccms>
         <!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
         <version.servlet>6.0.0</version.servlet>
         <!-- http://mvnrepository.com/artifact/org.springframework/spring-core -->

diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/constants/CmsVersion.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/constants/CmsVersion.java
@@ -28,7 +28,7 @@ public static final String getVersion() {
      * @return revision
      */
     public static final String getRevision() {
-        return "e";
+        return "f";
     }
 
     /**

diff --git a/...ms-parent/publiccms-core/src/main/java/com/publiccms/views/method/tools/GetXmlMethod.java b/...ms-parent/publiccms-core/src/main/java/com/publiccms/views/method/tools/GetXmlMethod.java
@@ -48,7 +48,7 @@ public Object execute(List<TemplateModel> arguments) throws TemplateModelExcepti
                 try {
                     DocumentBuilderFactory dbf = NodeModel.getDocumentBuilderFactory();
                     dbf.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
-                    dbf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", false);
+                    dbf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
                     dbf.setFeature("http://xml.org/sax/features/external-general-entities", false);
                     dbf.setXIncludeAware(false);
                     dbf.setExpandEntityReferences(false);