From 4088f2ee2b9d39bf7e61f88f4cd6c2919ccf066a Mon Sep 17 00:00:00 2001 From: Jeffery Xie Date: Thu, 11 Apr 2024 15:07:25 +1000 Subject: [PATCH] WW-5409 update new dtd from 6.4.0 to 6.5.0 --- .../apache/struts2/config/StrutsXmlConfigurationProvider.java | 2 +- .../src/main/resources/{struts-6.4.0.dtd => struts-6.5.0.dtd} | 4 ++-- .../config/providers/xwork-test-package-extends-final.xml | 4 ++-- .../xwork2/config/providers/xwork-test-package-final.xml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename core/src/main/resources/{struts-6.4.0.dtd => struts-6.5.0.dtd} (96%) diff --git a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java index d38b36cad..f5a516dfa 100644 --- a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java @@ -54,7 +54,7 @@ public class StrutsXmlConfigurationProvider extends XmlConfigurationProvider { put("-//Apache Software Foundation//DTD Struts Configuration 2.3//EN", "struts-2.3.dtd"); put("-//Apache Software Foundation//DTD Struts Configuration 2.5//EN", "struts-2.5.dtd"); put("-//Apache Software Foundation//DTD Struts Configuration 6.0//EN", "struts-6.0.dtd"); - put("-//Apache Software Foundation//DTD Struts Configuration 6.4.0//EN", "struts-6.4.0.dtd"); + put("-//Apache Software Foundation//DTD Struts Configuration 6.5.0//EN", "struts-6.5.0.dtd"); }}); private File baseDir = null; private final String filename; diff --git a/core/src/main/resources/struts-6.4.0.dtd b/core/src/main/resources/struts-6.5.0.dtd similarity index 96% rename from core/src/main/resources/struts-6.4.0.dtd rename to core/src/main/resources/struts-6.5.0.dtd index 222c29d24..bf1b534a9 100644 --- a/core/src/main/resources/struts-6.4.0.dtd +++ b/core/src/main/resources/struts-6.5.0.dtd @@ -26,8 +26,8 @@ Use the following DOCTYPE + "-//Apache Software Foundation//DTD Struts Configuration 6.5.0//EN" + "https://struts.apache.org/dtds/struts-6.5.0.dtd"> --> diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-extends-final.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-extends-final.xml index 6f01c8d15..28b9526b9 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-extends-final.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-extends-final.xml @@ -20,8 +20,8 @@ */ --> + "-//Apache Software Foundation//DTD Struts Configuration 6.5.0//EN" + "struts-6.5.0.dtd"> diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-final.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-final.xml index 8fd96bcc1..12ac2b4fa 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-final.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-final.xml @@ -20,8 +20,8 @@ */ --> + "-//Apache Software Foundation//DTD Struts Configuration 6.5.0//EN" + "struts-6.5.0.dtd">