[bazel] Update rules_jvm_external and all deps

Surprisingly, everything appears to compile.
SeleniumHQ · Mar 12, 2020 · 6fd2c55 · 6fd2c55
1 parent 7b8015a
commit 6fd2c55
Show file tree

Hide file tree

Showing 3 changed files with 1,613 additions and 1,349 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -24,9 +24,9 @@ rbe_autoconfig(name = "rbe_default")
 
 http_archive(
     name = "rules_jvm_external",
-    sha256 = "e246373de2353f3d34d35814947aa8b7d0dd1a58c2f7a6c41cfeaff3007c2d14",
-    strip_prefix = "rules_jvm_external-3.1",
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/3.1.zip",
+    sha256 = "82262ff4223c5fda6fb7ff8bd63db8131b51b413d26eb49e3131037e79e324af",
+    strip_prefix = "rules_jvm_external-3.2",
+    url = "https://github.com/bazelbuild/rules_jvm_external/archive/3.2.zip",
 )
 
 load("//java:maven_deps.bzl", "selenium_java_deps")

diff --git a/java/maven_deps.bzl b/java/maven_deps.bzl
@@ -2,22 +2,22 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
 load("@rules_jvm_external//:specs.bzl", "maven")
 
 def selenium_java_deps():
-    jetty_version = "9.4.25.v20191220"
-    netty_version = "4.1.45.Final"
+    jetty_version = "9.4.27.v20200227"
+    netty_version = "4.1.47.Final"
 
     maven_install(
         artifacts = [
             "com.beust:jcommander:1.78",
-            "com.github.javaparser:javaparser-core:3.15.8",
+            "com.github.javaparser:javaparser-core:3.15.14",
             "com.google.code.gson:gson:2.8.6",
             "com.google.guava:guava:28.2-jre",
             "com.google.auto:auto-common:0.10",
             "com.google.auto.service:auto-service:1.0-rc6",
             "com.google.auto.service:auto-service-annotations:1.0-rc6",
-            "com.squareup.okhttp3:okhttp:4.3.1",
-            "com.squareup.okio:okio:2.4.1",
+            "com.squareup.okhttp3:okhttp:4.4.1",
+            "com.squareup.okio:okio:2.4.3",
             "com.typesafe.netty:netty-reactive-streams:2.0.4",
-            "io.lettuce:lettuce-core:5.2.1.RELEASE",
+            "io.lettuce:lettuce-core:5.2.2.RELEASE",
             "io.netty:netty-buffer:%s" % netty_version,
             "io.netty:netty-codec-haproxy:%s" % netty_version,
             "io.netty:netty-codec-http:%s" % netty_version,
@@ -45,12 +45,12 @@ def selenium_java_deps():
                     "org.hamcrest:hamcrest-library",
                 ],
             ),
-            "net.bytebuddy:byte-buddy:1.10.6",
-            "net.sourceforge.htmlunit:htmlunit:2.36.0",
-            "net.sourceforge.htmlunit:htmlunit-core-js:2.36.0",
+            "net.bytebuddy:byte-buddy:1.10.8",
+            "net.sourceforge.htmlunit:htmlunit:2.38.0",
+            "net.sourceforge.htmlunit:htmlunit-core-js:2.38.0",
             "org.apache.commons:commons-exec:1.3",
-            "org.assertj:assertj-core:3.14.0",
-            "org.asynchttpclient:async-http-client:2.10.4",
+            "org.assertj:assertj-core:3.15.0",
+            "org.asynchttpclient:async-http-client:2.11.0",
             "org.eclipse.jetty:jetty-http:%s" % jetty_version,
             "org.eclipse.jetty:jetty-security:%s" % jetty_version,
             "org.eclipse.jetty:jetty-server:%s" % jetty_version,
@@ -59,27 +59,23 @@ def selenium_java_deps():
             "org.eclipse.jetty:jetty-util:%s" % jetty_version,
             "org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
             "org.hamcrest:hamcrest:2.2",
-            "org.mockito:mockito-core:3.2.4",
+            "org.mockito:mockito-core:3.3.0",
             "org.slf4j:slf4j-jdk14:1.7.30",
-            "org.testng:testng:6.14.3",
-            "org.zeromq:jeromq:0.5.1",
+            "org.testng:testng:7.1.0",
+            "org.zeromq:jeromq:0.5.2",
             "xyz.rogfam:littleproxy:2.0.0-beta-5",
-            maven.artifact(
-                group = "org.seleniumhq.selenium",
-                artifact = "htmlunit-driver",
-                version = "2.36.0",
-                exclusions = [
-                    "org.seleniumhq.selenium:selenium-api",
-                    "org.seleniumhq.selenium:selenium-remote-driver",
-                    "org.seleniumhq.selenium:selenium-support",
-                ],
-            ),
+            "org.seleniumhq.selenium:htmlunit-driver:2.38.0",
         ],
         excluded_artifacts = [
             "org.hamcrest:hamcrest-all", # Replaced by hamcrest 2
             "org.hamcrest:hamcrest-core",
             "io.netty:netty-all", # Depend on the actual things you need
         ],
+        override_targets = {
+            "org.seleniumhq.selenium:selenium-api": "@//java/client/src/org/openqa/selenium:core",
+            "org.seleniumhq.selenium:selenium-remote-driver": "@//java/client/src/org/openqa/selenium/remote:remote",
+            "org.seleniumhq.selenium:selenium-support": "@//java/client/src/org/openqa/selenium/support",
+        },
         fail_on_missing_checksum = True,
         fetch_sources = True,
         strict_visibility = True,