Fix xml file processing

OpenLiberty · Jan 31, 2024 · 69424be · 69424be
1 parent 4f0136c
commit 69424be
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 32 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -39,7 +39,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
@@ -124,7 +125,7 @@ jobs:
     - name: Clone ci.ant, ci.common, ci.gradle repos to C drive
       run: |
         cp -r D:/a/ci.gradle/ci.gradle C:/ci.gradle
-        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
     # Cache mvn/gradle packages
     - name: Cache Maven packages

diff --git a/src/test/groovy/io/openliberty/tools/gradle/BaseGenerateFeaturesTest.groovy b/src/test/groovy/io/openliberty/tools/gradle/BaseGenerateFeaturesTest.groovy
@@ -215,12 +215,14 @@ class BaseGenerateFeaturesTest extends AbstractIntegrationTest {
         }
 
         // 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/src/test/groovy/io/openliberty/tools/gradle/TestAppendServerEnvWithConfigServerEnv.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestAppendServerEnvWithConfigServerEnv.groovy
@@ -4,12 +4,6 @@ import org.junit.AfterClass
 import org.junit.BeforeClass
 import org.junit.Test
 
-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 org.junit.BeforeClass
 import org.junit.FixMethodOrder
 import org.junit.Test

diff --git a/src/test/groovy/io/openliberty/tools/gradle/TestAppendServerEnvWithNoProps.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestAppendServerEnvWithNoProps.groovy
@@ -4,12 +4,6 @@ import org.junit.AfterClass
 import org.junit.BeforeClass
 import org.junit.Test
 
-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 java.io.BufferedReader;
 import java.io.FileReader;
 

diff --git a/src/test/groovy/io/openliberty/tools/gradle/TestAppendServerEnvWithOnlyProps.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestAppendServerEnvWithOnlyProps.groovy
@@ -4,12 +4,6 @@ import org.junit.AfterClass
 import org.junit.BeforeClass
 import org.junit.Test
 
-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 java.io.BufferedReader;
 import java.io.FileReader;
 

diff --git a/src/test/groovy/io/openliberty/tools/gradle/TestAppendServerEnvWithProps.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestAppendServerEnvWithProps.groovy
@@ -4,12 +4,6 @@ import org.junit.AfterClass
 import org.junit.BeforeClass
 import org.junit.Test
 
-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 java.io.BufferedReader;
 import java.io.FileReader;
 

diff --git a/src/test/groovy/io/openliberty/tools/gradle/TestCompileJSP.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestCompileJSP.groovy
@@ -66,6 +66,8 @@ public class TestCompileJSP extends AbstractIntegrationTest{
         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/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplication.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplication.groovy
@@ -67,6 +67,8 @@ public class TestLooseApplication extends AbstractIntegrationTest{
       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/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationWithWarTask.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationWithWarTask.groovy
@@ -66,6 +66,8 @@ public class TestLooseApplicationWithWarTask extends AbstractIntegrationTest{
       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/src/test/groovy/io/openliberty/tools/gradle/TestLooseEarApplication.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestLooseEarApplication.groovy
@@ -78,6 +78,8 @@ public class TestLooseEarApplication extends AbstractIntegrationTest{
       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/src/test/groovy/io/openliberty/tools/gradle/TestLooseEarApplicationEarlibs.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestLooseEarApplicationEarlibs.groovy
@@ -80,6 +80,8 @@ public class TestLooseEarApplicationEarlibs extends AbstractIntegrationTest{
         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/src/test/groovy/io/openliberty/tools/gradle/TestLooseWarWithLooseJar.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestLooseWarWithLooseJar.groovy
@@ -68,6 +68,8 @@ public class TestLooseWarWithLooseJar extends AbstractIntegrationTest{
         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/src/test/groovy/io/openliberty/tools/gradle/TestMultiModuleLooseEar.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestMultiModuleLooseEar.groovy
@@ -77,6 +77,8 @@ public class TestMultiModuleLooseEar extends AbstractIntegrationTest{
         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/src/test/groovy/io/openliberty/tools/gradle/TestPluginConfigFile.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestPluginConfigFile.groovy
@@ -68,6 +68,8 @@ public class TestPluginConfigFile extends AbstractIntegrationTest{
       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/src/test/groovy/io/openliberty/tools/gradle/VerifyLooseAppTestTimeoutSuccess.groovy b/src/test/groovy/io/openliberty/tools/gradle/VerifyLooseAppTestTimeoutSuccess.groovy
@@ -66,6 +66,8 @@ public class VerifyLooseAppTestTimeoutSuccess extends AbstractIntegrationTest{
       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);