From 983c45f9e168dc28669fe5660631226dc169227d Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Thu, 7 Nov 2019 21:50:41 +0100
Subject: [PATCH 1/2] Bump HTMLUnit version from 2.31 to 2.36.0.

---
 pom.xml                                                       | 3 ++-
 .../java/com/gargoylesoftware/htmlunit/html/DomNodeUtil.java  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index f99fbb402..199ea1cb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@ THE SOFTWARE.
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jetty.version>9.4.5.v20170502</jetty.version>
     <hamcrest.version>2.2</hamcrest.version>
+    <htmlunit.version>2.36.0-1</htmlunit.version>
     <java.level>8</java.level>
     <concurrency>1</concurrency> <!-- may use e.g. 2C for 2 × (number of cores) -->
     <!--TODO: fix FindBugs-->
@@ -129,7 +130,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness-htmlunit</artifactId>
-      <version>2.31-2</version>
+      <version>${htmlunit.version}</version>
       <exclusions>
         <exclusion>
           <groupId>commons-io</groupId>
diff --git a/src/main/java/com/gargoylesoftware/htmlunit/html/DomNodeUtil.java b/src/main/java/com/gargoylesoftware/htmlunit/html/DomNodeUtil.java
index 8d92bef26..f714f0421 100644
--- a/src/main/java/com/gargoylesoftware/htmlunit/html/DomNodeUtil.java
+++ b/src/main/java/com/gargoylesoftware/htmlunit/html/DomNodeUtil.java
@@ -24,7 +24,7 @@
 package com.gargoylesoftware.htmlunit.html;
 
 import com.gargoylesoftware.htmlunit.WebClientUtil;
-import com.gargoylesoftware.htmlunit.html.xpath.XPathUtils;
+import com.gargoylesoftware.htmlunit.html.xpath.XPathHelper;
 
 import java.util.List;
 
@@ -47,7 +47,7 @@ public class DomNodeUtil {
      */
     public static <E> List<E> selectNodes(final DomNode domNode, final String xpathExpr) {
         WebClientUtil.waitForJSExec(domNode.getPage().getWebClient());
-        return (List) XPathUtils.getByXPath(domNode, xpathExpr, null);
+        return (List) XPathHelper.getByXPath(domNode, xpathExpr, null, false);
     }
 
     /**

From fbc69cbd0c26c4e73187ceefb692247d2cee3d77 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Thu, 7 Nov 2019 22:08:48 +0100
Subject: [PATCH 2/2] Implement missing warn method in JavaScriptErrorListener.

---
 .../java/com/gargoylesoftware/htmlunit/WebClientUtil.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/com/gargoylesoftware/htmlunit/WebClientUtil.java b/src/main/java/com/gargoylesoftware/htmlunit/WebClientUtil.java
index c08d2574f..daec8aab5 100644
--- a/src/main/java/com/gargoylesoftware/htmlunit/WebClientUtil.java
+++ b/src/main/java/com/gargoylesoftware/htmlunit/WebClientUtil.java
@@ -136,5 +136,9 @@ public void malformedScriptURL(HtmlPage htmlPage, String url, MalformedURLExcept
         @Override
         public void loadScriptError(HtmlPage htmlPage, URL scriptUrl, Exception exception) {
         }
+
+        @Override
+        public void warn(String message, String sourceName, int line, String lineSource, int lineOffset) {
+        }
     }
 }