diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 5c5bb1be0..702fc1225 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -48,7 +48,8 @@ jobs: - name: Checkout ci.common uses: actions/checkout@v3 with: - repository: OpenLiberty/ci.common + repository: cherylking/ci.common + ref: fixXmlFileProcessing path: ci.common - name: Checkout ci.ant uses: actions/checkout@v3 @@ -102,7 +103,7 @@ jobs: - name: Clone ci.ant, ci.common, ci.maven repos to C drive run: | cp -r D:/a/ci.maven/ci.maven C:/ci.maven - git clone https://github.com/OpenLiberty/ci.common.git C:/ci.common + git clone https://github.com/cherylking/ci.common.git --branch fixXmlFileProcessing --single-branch C:/ci.common git clone https://github.com/OpenLiberty/ci.ant.git C:/ci.ant - name: Set up Maven uses: stCarolas/setup-maven@v4.5 diff --git a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-default-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-default-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java index 93e41d2f1..5858730fd 100644 --- a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-default-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java +++ b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-default-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java @@ -1,21 +1,8 @@ package net.wasdev.wlp.maven.test.app; import java.io.File; -import java.io.FileInputStream; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathFactory; - -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /** * diff --git a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-default-recursive-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-default-recursive-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java index b683a0dc1..353ca5ce5 100644 --- a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-default-recursive-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java +++ b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-default-recursive-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java @@ -44,6 +44,8 @@ public void testApplicationConfiguredInConfigDropins() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java index 975c6428b..ab59e7de8 100644 --- a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java +++ b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java @@ -41,6 +41,8 @@ public void testApplicationConfiguredInConfigDropins() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java index daec1a407..d2f2d2e0b 100644 --- a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java +++ b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java @@ -41,6 +41,8 @@ public void testXmlElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-variables-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-variables-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java index c9eb7b710..59becaac8 100644 --- a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-variables-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java +++ b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-variables-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java @@ -37,6 +37,8 @@ public void testApplicationConfiguredInConfigDropins() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/appsdirectory-apps-dependency-notconfigured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java b/liberty-maven-plugin/src/it/appsdirectory-apps-dependency-notconfigured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java index 49df164c9..d4c7cd337 100644 --- a/liberty-maven-plugin/src/it/appsdirectory-apps-dependency-notconfigured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java +++ b/liberty-maven-plugin/src/it/appsdirectory-apps-dependency-notconfigured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java @@ -45,6 +45,8 @@ public void testXmlElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); @@ -104,6 +106,8 @@ public void testApplicationConfiguredInConfigDropins() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/appsdirectory-apps-notconfigured-dependency-configured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java b/liberty-maven-plugin/src/it/appsdirectory-apps-notconfigured-dependency-configured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java index 903a8eb30..ebbf2b647 100644 --- a/liberty-maven-plugin/src/it/appsdirectory-apps-notconfigured-dependency-configured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java +++ b/liberty-maven-plugin/src/it/appsdirectory-apps-notconfigured-dependency-configured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java @@ -45,6 +45,8 @@ public void testXmlElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); @@ -104,6 +106,8 @@ public void testApplicationConfiguredInConfigDropins() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/appsdirectory-apps-notconfigured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java b/liberty-maven-plugin/src/it/appsdirectory-apps-notconfigured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java index 90fca39fb..faa7e9a13 100644 --- a/liberty-maven-plugin/src/it/appsdirectory-apps-notconfigured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java +++ b/liberty-maven-plugin/src/it/appsdirectory-apps-notconfigured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java @@ -44,6 +44,8 @@ public void testXmlElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); @@ -100,6 +102,8 @@ public void testApplicationConfiguredInConfigDropins() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/appsdirectory-dropins-notconfigured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java b/liberty-maven-plugin/src/it/appsdirectory-dropins-notconfigured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java index 061dbde56..b27a85925 100644 --- a/liberty-maven-plugin/src/it/appsdirectory-dropins-notconfigured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java +++ b/liberty-maven-plugin/src/it/appsdirectory-dropins-notconfigured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java @@ -41,6 +41,8 @@ public void testXmlElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/appsdirectory-notset-configured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java b/liberty-maven-plugin/src/it/appsdirectory-notset-configured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java index 5b889997b..041414366 100644 --- a/liberty-maven-plugin/src/it/appsdirectory-notset-configured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java +++ b/liberty-maven-plugin/src/it/appsdirectory-notset-configured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java @@ -41,6 +41,8 @@ public void testXmlElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/appsdirectory-notset-notconfigured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java b/liberty-maven-plugin/src/it/appsdirectory-notset-notconfigured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java index 6b3c23c10..0ec29e28f 100644 --- a/liberty-maven-plugin/src/it/appsdirectory-notset-notconfigured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java +++ b/liberty-maven-plugin/src/it/appsdirectory-notset-notconfigured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java @@ -41,6 +41,8 @@ public void testXmlElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/assembly-it/assembly-it-artifact/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlIT.java b/liberty-maven-plugin/src/it/assembly-it/assembly-it-artifact/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlIT.java index 8024fbcab..2c25c31b7 100644 --- a/liberty-maven-plugin/src/it/assembly-it/assembly-it-artifact/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlIT.java +++ b/liberty-maven-plugin/src/it/assembly-it/assembly-it-artifact/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlIT.java @@ -41,7 +41,9 @@ public void testXmlElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); - DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); + DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); // parse input XML Document diff --git a/liberty-maven-plugin/src/it/binary-scanner-it/src/test/java/net/wasdev/wlp/test/dev/it/BaseScannerTest.java b/liberty-maven-plugin/src/it/binary-scanner-it/src/test/java/net/wasdev/wlp/test/dev/it/BaseScannerTest.java index e805a1b70..946f354cb 100644 --- a/liberty-maven-plugin/src/it/binary-scanner-it/src/test/java/net/wasdev/wlp/test/dev/it/BaseScannerTest.java +++ b/liberty-maven-plugin/src/it/binary-scanner-it/src/test/java/net/wasdev/wlp/test/dev/it/BaseScannerTest.java @@ -296,12 +296,14 @@ protected static Set readFeatures(File configurationFile) throws Excepti } // read configuration xml file - DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance(); - docBuilderFactory.setIgnoringComments(true); - docBuilderFactory.setCoalescing(true); - docBuilderFactory.setIgnoringElementContentWhitespace(true); - docBuilderFactory.setValidating(false); - DocumentBuilder documentBuilder = docBuilderFactory.newDocumentBuilder(); + DocumentBuilderFactory inputBuilderFactory = DocumentBuilderFactory.newInstance(); + inputBuilderFactory.setIgnoringComments(true); + inputBuilderFactory.setCoalescing(true); + inputBuilderFactory.setIgnoringElementContentWhitespace(true); + inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); + DocumentBuilder documentBuilder = inputBuilderFactory.newDocumentBuilder(); Document doc = documentBuilder.parse(configurationFile); XPath xPath = XPathFactory.newInstance().newXPath(); diff --git a/liberty-maven-plugin/src/it/compile-jsp-it/src/test/java/net/wasdev/wlp/maven/test/app/CompileJSPTest.java b/liberty-maven-plugin/src/it/compile-jsp-it/src/test/java/net/wasdev/wlp/maven/test/app/CompileJSPTest.java index 9c2dc876a..6382291a8 100644 --- a/liberty-maven-plugin/src/it/compile-jsp-it/src/test/java/net/wasdev/wlp/maven/test/app/CompileJSPTest.java +++ b/liberty-maven-plugin/src/it/compile-jsp-it/src/test/java/net/wasdev/wlp/maven/test/app/CompileJSPTest.java @@ -46,6 +46,8 @@ public void testXmlElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/LibertySettingsDirectoryTest.java b/liberty-maven-plugin/src/it/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/LibertySettingsDirectoryTest.java index e64b7635f..2c45f9198 100644 --- a/liberty-maven-plugin/src/it/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/LibertySettingsDirectoryTest.java +++ b/liberty-maven-plugin/src/it/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/LibertySettingsDirectoryTest.java @@ -39,6 +39,8 @@ public void testLibertyConfigDirValidDir() throws Exception { @Test public void testLibertyConfigDirInvalidDir() throws Exception { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + factory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder builder = factory.newDocumentBuilder(); File pomFilePath = new File("../pom.xml"); diff --git a/liberty-maven-plugin/src/it/deploy-loose-config-apps-it/src/test/java/net/wasdev/wlp/test/servlet/it/LooseConfigTest.java b/liberty-maven-plugin/src/it/deploy-loose-config-apps-it/src/test/java/net/wasdev/wlp/test/servlet/it/LooseConfigTest.java index f4d149990..2d8c1bedf 100644 --- a/liberty-maven-plugin/src/it/deploy-loose-config-apps-it/src/test/java/net/wasdev/wlp/test/servlet/it/LooseConfigTest.java +++ b/liberty-maven-plugin/src/it/deploy-loose-config-apps-it/src/test/java/net/wasdev/wlp/test/servlet/it/LooseConfigTest.java @@ -48,6 +48,8 @@ public void testXmlElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/deploy-loose-config-exploded-it/src/test/java/mypkg/ExplodedFilteredDDTest.java b/liberty-maven-plugin/src/it/deploy-loose-config-exploded-it/src/test/java/mypkg/ExplodedFilteredDDTest.java index ec1a3857b..e16c4141b 100644 --- a/liberty-maven-plugin/src/it/deploy-loose-config-exploded-it/src/test/java/mypkg/ExplodedFilteredDDTest.java +++ b/liberty-maven-plugin/src/it/deploy-loose-config-exploded-it/src/test/java/mypkg/ExplodedFilteredDDTest.java @@ -48,6 +48,8 @@ public void testExplodedLooseAppFormat() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/deploy-loose-config-exploded-it/src/test/java/mypkg/ExplodedTest.java b/liberty-maven-plugin/src/it/deploy-loose-config-exploded-it/src/test/java/mypkg/ExplodedTest.java index 8792d164d..7a71826f4 100644 --- a/liberty-maven-plugin/src/it/deploy-loose-config-exploded-it/src/test/java/mypkg/ExplodedTest.java +++ b/liberty-maven-plugin/src/it/deploy-loose-config-exploded-it/src/test/java/mypkg/ExplodedTest.java @@ -47,6 +47,8 @@ public void testExplodedLooseAppFormat() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/deploy-loose-config-exploded-it/src/test/java/mypkg/NonExplodedTest.java b/liberty-maven-plugin/src/it/deploy-loose-config-exploded-it/src/test/java/mypkg/NonExplodedTest.java index d822e6c23..0005bc183 100644 --- a/liberty-maven-plugin/src/it/deploy-loose-config-exploded-it/src/test/java/mypkg/NonExplodedTest.java +++ b/liberty-maven-plugin/src/it/deploy-loose-config-exploded-it/src/test/java/mypkg/NonExplodedTest.java @@ -49,6 +49,8 @@ public void testNonExplodedLooseAppFormat() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/deploy-loose-config-it/src/test/java/net/wasdev/wlp/test/servlet/it/LooseConfigTest.java b/liberty-maven-plugin/src/it/deploy-loose-config-it/src/test/java/net/wasdev/wlp/test/servlet/it/LooseConfigTest.java index aff5bd131..b98346d0c 100644 --- a/liberty-maven-plugin/src/it/deploy-loose-config-it/src/test/java/net/wasdev/wlp/test/servlet/it/LooseConfigTest.java +++ b/liberty-maven-plugin/src/it/deploy-loose-config-it/src/test/java/net/wasdev/wlp/test/servlet/it/LooseConfigTest.java @@ -47,6 +47,8 @@ public void testXmlElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/ear-project-it/AppXmlEAR/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java b/liberty-maven-plugin/src/it/ear-project-it/AppXmlEAR/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java index 0d6daad5f..696ad4323 100644 --- a/liberty-maven-plugin/src/it/ear-project-it/AppXmlEAR/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java +++ b/liberty-maven-plugin/src/it/ear-project-it/AppXmlEAR/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java @@ -52,6 +52,8 @@ public void testLooseApplicationFileContent() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/ear-project-it/SampleEAR-classifier-app/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java b/liberty-maven-plugin/src/it/ear-project-it/SampleEAR-classifier-app/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java index 33c41fd8c..f70f47ace 100644 --- a/liberty-maven-plugin/src/it/ear-project-it/SampleEAR-classifier-app/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java +++ b/liberty-maven-plugin/src/it/ear-project-it/SampleEAR-classifier-app/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java @@ -52,6 +52,8 @@ public void testLooseApplicationFileContent() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/ear-project-it/SampleEAR/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java b/liberty-maven-plugin/src/it/ear-project-it/SampleEAR/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java index 053d428e2..2a1ac53ce 100644 --- a/liberty-maven-plugin/src/it/ear-project-it/SampleEAR/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java +++ b/liberty-maven-plugin/src/it/ear-project-it/SampleEAR/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java @@ -52,6 +52,8 @@ public void testLooseApplicationFileContent() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/ear-project-it/SampleEAR/src/test/java/net/wasdev/wlp/maven/test/it/PluginConfigXmlIT.java b/liberty-maven-plugin/src/it/ear-project-it/SampleEAR/src/test/java/net/wasdev/wlp/maven/test/it/PluginConfigXmlIT.java index 10d692b5e..c260c8d31 100644 --- a/liberty-maven-plugin/src/it/ear-project-it/SampleEAR/src/test/java/net/wasdev/wlp/maven/test/it/PluginConfigXmlIT.java +++ b/liberty-maven-plugin/src/it/ear-project-it/SampleEAR/src/test/java/net/wasdev/wlp/maven/test/it/PluginConfigXmlIT.java @@ -35,6 +35,8 @@ public void testXmlElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/ear-project-it/SampleWLP/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java b/liberty-maven-plugin/src/it/ear-project-it/SampleWLP/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java index b183ea536..d1d725fff 100644 --- a/liberty-maven-plugin/src/it/ear-project-it/SampleWLP/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java +++ b/liberty-maven-plugin/src/it/ear-project-it/SampleWLP/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java @@ -51,6 +51,8 @@ public void testLooseApplicationFileContent() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/ear-project-it/SampleWLP/src/test/java/net/wasdev/wlp/maven/test/it/PluginConfigXmlIT.java b/liberty-maven-plugin/src/it/ear-project-it/SampleWLP/src/test/java/net/wasdev/wlp/maven/test/it/PluginConfigXmlIT.java index 99e6ee9d0..2d10a24ad 100644 --- a/liberty-maven-plugin/src/it/ear-project-it/SampleWLP/src/test/java/net/wasdev/wlp/maven/test/it/PluginConfigXmlIT.java +++ b/liberty-maven-plugin/src/it/ear-project-it/SampleWLP/src/test/java/net/wasdev/wlp/maven/test/it/PluginConfigXmlIT.java @@ -35,6 +35,8 @@ public void testXmlElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/ear-project-it/helloworld-ear/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java b/liberty-maven-plugin/src/it/ear-project-it/helloworld-ear/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java index 146e7b622..963779289 100644 --- a/liberty-maven-plugin/src/it/ear-project-it/helloworld-ear/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java +++ b/liberty-maven-plugin/src/it/ear-project-it/helloworld-ear/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java @@ -51,6 +51,8 @@ public void testLooseApplicationFileContent() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/ear-project-it/skinnywar-ear/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java b/liberty-maven-plugin/src/it/ear-project-it/skinnywar-ear/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java index 5d5812a43..507e85914 100644 --- a/liberty-maven-plugin/src/it/ear-project-it/skinnywar-ear/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java +++ b/liberty-maven-plugin/src/it/ear-project-it/skinnywar-ear/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java @@ -52,6 +52,8 @@ public void testLooseApplicationFileContent() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/ear-project-it/skinnywar-wlp/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java b/liberty-maven-plugin/src/it/ear-project-it/skinnywar-wlp/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java index 1aaa381db..392c6c8ae 100644 --- a/liberty-maven-plugin/src/it/ear-project-it/skinnywar-wlp/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java +++ b/liberty-maven-plugin/src/it/ear-project-it/skinnywar-wlp/src/test/java/net/wasdev/wlp/maven/test/it/LooseConfigTestIT.java @@ -52,6 +52,8 @@ public void testLooseApplicationFileContent() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/generate-features-it/src/test/java/net/wasdev/wlp/test/dev/it/BaseGenerateFeaturesTest.java b/liberty-maven-plugin/src/it/generate-features-it/src/test/java/net/wasdev/wlp/test/dev/it/BaseGenerateFeaturesTest.java index 0fc995b28..f5d2c10bb 100644 --- a/liberty-maven-plugin/src/it/generate-features-it/src/test/java/net/wasdev/wlp/test/dev/it/BaseGenerateFeaturesTest.java +++ b/liberty-maven-plugin/src/it/generate-features-it/src/test/java/net/wasdev/wlp/test/dev/it/BaseGenerateFeaturesTest.java @@ -203,12 +203,14 @@ protected static Set readFeatures(File configurationFile) throws Excepti } // read configuration xml file - DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance(); - docBuilderFactory.setIgnoringComments(true); - docBuilderFactory.setCoalescing(true); - docBuilderFactory.setIgnoringElementContentWhitespace(true); - docBuilderFactory.setValidating(false); - DocumentBuilder documentBuilder = docBuilderFactory.newDocumentBuilder(); + DocumentBuilderFactory inputBuilderFactory = DocumentBuilderFactory.newInstance(); + inputBuilderFactory.setIgnoringComments(true); + inputBuilderFactory.setCoalescing(true); + inputBuilderFactory.setIgnoringElementContentWhitespace(true); + inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); + DocumentBuilder documentBuilder = inputBuilderFactory.newDocumentBuilder(); Document doc = documentBuilder.parse(configurationFile); XPath xPath = XPathFactory.newInstance().newXPath(); diff --git a/liberty-maven-plugin/src/it/install-apps-project-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java b/liberty-maven-plugin/src/it/install-apps-project-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java index 0e45f60b3..8761eb8e0 100644 --- a/liberty-maven-plugin/src/it/install-apps-project-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java +++ b/liberty-maven-plugin/src/it/install-apps-project-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlTest.java @@ -41,6 +41,8 @@ public void testXmlElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/loose-config-it/src/test/java/net/wasdev/wlp/test/servlet/it/LooseConfigTest.java b/liberty-maven-plugin/src/it/loose-config-it/src/test/java/net/wasdev/wlp/test/servlet/it/LooseConfigTest.java index 9b9c453de..bde7f27fe 100644 --- a/liberty-maven-plugin/src/it/loose-config-it/src/test/java/net/wasdev/wlp/test/servlet/it/LooseConfigTest.java +++ b/liberty-maven-plugin/src/it/loose-config-it/src/test/java/net/wasdev/wlp/test/servlet/it/LooseConfigTest.java @@ -47,6 +47,8 @@ public void testXmlElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/loose-war-ejb-it/war/src/test/java/net/wasdev/wlp/test/servlet/it/LooseConfigIT.java b/liberty-maven-plugin/src/it/loose-war-ejb-it/war/src/test/java/net/wasdev/wlp/test/servlet/it/LooseConfigIT.java index 929c2aba4..4f9ce8f3f 100644 --- a/liberty-maven-plugin/src/it/loose-war-ejb-it/war/src/test/java/net/wasdev/wlp/test/servlet/it/LooseConfigIT.java +++ b/liberty-maven-plugin/src/it/loose-war-ejb-it/war/src/test/java/net/wasdev/wlp/test/servlet/it/LooseConfigIT.java @@ -47,6 +47,8 @@ public void testXmlElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/loose-war-ejb-type-it/war/src/test/java/net/wasdev/wlp/test/servlet/it/LooseConfigIT.java b/liberty-maven-plugin/src/it/loose-war-ejb-type-it/war/src/test/java/net/wasdev/wlp/test/servlet/it/LooseConfigIT.java index cd41f10b8..676d6af6d 100644 --- a/liberty-maven-plugin/src/it/loose-war-ejb-type-it/war/src/test/java/net/wasdev/wlp/test/servlet/it/LooseConfigIT.java +++ b/liberty-maven-plugin/src/it/loose-war-ejb-type-it/war/src/test/java/net/wasdev/wlp/test/servlet/it/LooseConfigIT.java @@ -47,6 +47,8 @@ public void testXmlElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc=inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/server-config-props-it/src/test/java/net/wasdev/wlp/test/servlet/it/ServerConfigPropertiesTest.java b/liberty-maven-plugin/src/it/server-config-props-it/src/test/java/net/wasdev/wlp/test/servlet/it/ServerConfigPropertiesTest.java index edbb5e314..f07f9715f 100644 --- a/liberty-maven-plugin/src/it/server-config-props-it/src/test/java/net/wasdev/wlp/test/servlet/it/ServerConfigPropertiesTest.java +++ b/liberty-maven-plugin/src/it/server-config-props-it/src/test/java/net/wasdev/wlp/test/servlet/it/ServerConfigPropertiesTest.java @@ -54,6 +54,8 @@ public class ServerConfigPropertiesTest { @BeforeClass public static void setup() throws Exception { factory = DocumentBuilderFactory.newInstance(); + factory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); builder = factory.newDocumentBuilder(); xpathFactory = XPathFactory.newInstance(); diff --git a/liberty-maven-plugin/src/it/server-param-configdir-not-override-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlIT.java b/liberty-maven-plugin/src/it/server-param-configdir-not-override-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlIT.java index 3b64657a5..ade6e84e8 100644 --- a/liberty-maven-plugin/src/it/server-param-configdir-not-override-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlIT.java +++ b/liberty-maven-plugin/src/it/server-param-configdir-not-override-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlIT.java @@ -45,6 +45,8 @@ public void testServerXmlFileElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc = inputBuilder.parse(input); @@ -75,6 +77,8 @@ public void testBootstrapPropertiesFileElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc = inputBuilder.parse(input); @@ -109,6 +113,8 @@ public void testJvmOptionsFileElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc = inputBuilder.parse(input); @@ -143,6 +149,8 @@ public void testServerEnvElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc = inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/server-param-default-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlIT.java b/liberty-maven-plugin/src/it/server-param-default-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlIT.java index 68370b365..defdb2b90 100644 --- a/liberty-maven-plugin/src/it/server-param-default-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlIT.java +++ b/liberty-maven-plugin/src/it/server-param-default-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlIT.java @@ -42,6 +42,8 @@ public void testBootstrapPropertiesFileElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc = inputBuilder.parse(input); @@ -68,6 +70,8 @@ public void testJvmOptionsFileElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc = inputBuilder.parse(input); @@ -94,6 +98,8 @@ public void testServerEnvElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc = inputBuilder.parse(input); diff --git a/liberty-maven-plugin/src/it/server-param-pom-override-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlIT.java b/liberty-maven-plugin/src/it/server-param-pom-override-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlIT.java index 0aed9ff65..dc3217957 100644 --- a/liberty-maven-plugin/src/it/server-param-pom-override-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlIT.java +++ b/liberty-maven-plugin/src/it/server-param-pom-override-it/src/test/java/net/wasdev/wlp/maven/test/app/PluginConfigXmlIT.java @@ -54,6 +54,8 @@ public void testServerXmlFileElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc = inputBuilder.parse(input); @@ -84,6 +86,8 @@ public void testBootstrapPropertiesFileElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc = inputBuilder.parse(input); @@ -138,6 +142,8 @@ public void testJvmOptionsFileElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc = inputBuilder.parse(input); @@ -258,6 +264,8 @@ public void testServerEnvElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc = inputBuilder.parse(input); @@ -283,6 +291,8 @@ public void testServerConfigDropinsOverridesVarElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc = inputBuilder.parse(input); @@ -326,6 +336,8 @@ public void testServerConfigDropinsDefaultsVarElements() throws Exception { inputBuilderFactory.setCoalescing(true); inputBuilderFactory.setIgnoringElementContentWhitespace(true); inputBuilderFactory.setValidating(false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false); + inputBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder inputBuilder = inputBuilderFactory.newDocumentBuilder(); Document inputDoc = inputBuilder.parse(input);