From 93f11a6da362f7a74eecbee5bf8a0c94c71d1b36 Mon Sep 17 00:00:00 2001
From: Anton Bannykh <Anton.Bannykh@jetbrains.com>
Date: Thu, 6 Apr 2017 18:38:18 +0300
Subject: [PATCH] Update HtmlUnit driver to version 2.24; run tests using JDK
 1.8

The old version had very limited TypedArray support, which lead to
browser-example crashes.
The new version of HtmlUnit needs JDK 1.8 to run.
---
 libraries/examples/browser-example-with-library/pom.xml | 6 +++---
 libraries/examples/browser-example/pom.xml              | 6 +++---
 libraries/pom.xml                                       | 1 +
 libraries/tools/kotlin-js-tests-junit/pom.xml           | 6 +++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/libraries/examples/browser-example-with-library/pom.xml b/libraries/examples/browser-example-with-library/pom.xml
index 7c11be5c319..ad16cac99b9 100644
--- a/libraries/examples/browser-example-with-library/pom.xml
+++ b/libraries/examples/browser-example-with-library/pom.xml
@@ -47,8 +47,8 @@
         </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-htmlunit-driver</artifactId>
-            <version>${selenium.version}</version>
+            <artifactId>htmlunit-driver</artifactId>
+            <version>${htmlunit.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -116,7 +116,7 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <jvm>${env.JDK_17}/bin/java</jvm>
+                    <jvm>${env.JDK_18}/bin/java</jvm>
                 </configuration>
             </plugin>
 
diff --git a/libraries/examples/browser-example/pom.xml b/libraries/examples/browser-example/pom.xml
index 9ad823c34ba..2347a49dd98 100644
--- a/libraries/examples/browser-example/pom.xml
+++ b/libraries/examples/browser-example/pom.xml
@@ -42,8 +42,8 @@
         </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-htmlunit-driver</artifactId>
-            <version>${selenium.version}</version>
+            <artifactId>htmlunit-driver</artifactId>
+            <version>${htmlunit.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -104,7 +104,7 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <jvm>${env.JDK_17}/bin/java</jvm>
+                    <jvm>${env.JDK_18}/bin/java</jvm>
                 </configuration>
             </plugin>
 
diff --git a/libraries/pom.xml b/libraries/pom.xml
index b4cfa54905e..347c1d77fa2 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -47,6 +47,7 @@
         <surefire-version>2.16</surefire-version>
         <exec-maven-plugin.version>1.2.1</exec-maven-plugin.version>
         <selenium.version>2.52.0</selenium.version>
+        <htmlunit.version>2.24</htmlunit.version>
 
         <kotlin-dist>${project-root}/dist</kotlin-dist>
         <kotlin-sdk>${kotlin-dist}/kotlinc</kotlin-sdk>
diff --git a/libraries/tools/kotlin-js-tests-junit/pom.xml b/libraries/tools/kotlin-js-tests-junit/pom.xml
index 244717b4733..10fb0200a78 100644
--- a/libraries/tools/kotlin-js-tests-junit/pom.xml
+++ b/libraries/tools/kotlin-js-tests-junit/pom.xml
@@ -44,8 +44,8 @@
         </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-htmlunit-driver</artifactId>
-            <version>${selenium.version}</version>
+            <artifactId>htmlunit-driver</artifactId>
+            <version>${htmlunit.version}</version>
         </dependency>
     </dependencies>
 
@@ -79,7 +79,7 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <jvm>${env.JDK_17}/bin/java</jvm>
+                    <jvm>${env.JDK_18}/bin/java</jvm>
                 </configuration>
             </plugin>
             <plugin>