Skip to content

Commit 6fd2c55

Browse files
committed
[bazel] Update rules_jvm_external and all deps
Surprisingly, everything appears to compile.
1 parent 7b8015a commit 6fd2c55

File tree

3 files changed

+1613
-1349
lines changed

3 files changed

+1613
-1349
lines changed

WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ rbe_autoconfig(name = "rbe_default")
2424

2525
http_archive(
2626
name = "rules_jvm_external",
27-
sha256 = "e246373de2353f3d34d35814947aa8b7d0dd1a58c2f7a6c41cfeaff3007c2d14",
28-
strip_prefix = "rules_jvm_external-3.1",
29-
url = "https://github.com/bazelbuild/rules_jvm_external/archive/3.1.zip",
27+
sha256 = "82262ff4223c5fda6fb7ff8bd63db8131b51b413d26eb49e3131037e79e324af",
28+
strip_prefix = "rules_jvm_external-3.2",
29+
url = "https://github.com/bazelbuild/rules_jvm_external/archive/3.2.zip",
3030
)
3131

3232
load("//java:maven_deps.bzl", "selenium_java_deps")

java/maven_deps.bzl

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
22
load("@rules_jvm_external//:specs.bzl", "maven")
33

44
def selenium_java_deps():
5-
jetty_version = "9.4.25.v20191220"
6-
netty_version = "4.1.45.Final"
5+
jetty_version = "9.4.27.v20200227"
6+
netty_version = "4.1.47.Final"
77

88
maven_install(
99
artifacts = [
1010
"com.beust:jcommander:1.78",
11-
"com.github.javaparser:javaparser-core:3.15.8",
11+
"com.github.javaparser:javaparser-core:3.15.14",
1212
"com.google.code.gson:gson:2.8.6",
1313
"com.google.guava:guava:28.2-jre",
1414
"com.google.auto:auto-common:0.10",
1515
"com.google.auto.service:auto-service:1.0-rc6",
1616
"com.google.auto.service:auto-service-annotations:1.0-rc6",
17-
"com.squareup.okhttp3:okhttp:4.3.1",
18-
"com.squareup.okio:okio:2.4.1",
17+
"com.squareup.okhttp3:okhttp:4.4.1",
18+
"com.squareup.okio:okio:2.4.3",
1919
"com.typesafe.netty:netty-reactive-streams:2.0.4",
20-
"io.lettuce:lettuce-core:5.2.1.RELEASE",
20+
"io.lettuce:lettuce-core:5.2.2.RELEASE",
2121
"io.netty:netty-buffer:%s" % netty_version,
2222
"io.netty:netty-codec-haproxy:%s" % netty_version,
2323
"io.netty:netty-codec-http:%s" % netty_version,
@@ -45,12 +45,12 @@ def selenium_java_deps():
4545
"org.hamcrest:hamcrest-library",
4646
],
4747
),
48-
"net.bytebuddy:byte-buddy:1.10.6",
49-
"net.sourceforge.htmlunit:htmlunit:2.36.0",
50-
"net.sourceforge.htmlunit:htmlunit-core-js:2.36.0",
48+
"net.bytebuddy:byte-buddy:1.10.8",
49+
"net.sourceforge.htmlunit:htmlunit:2.38.0",
50+
"net.sourceforge.htmlunit:htmlunit-core-js:2.38.0",
5151
"org.apache.commons:commons-exec:1.3",
52-
"org.assertj:assertj-core:3.14.0",
53-
"org.asynchttpclient:async-http-client:2.10.4",
52+
"org.assertj:assertj-core:3.15.0",
53+
"org.asynchttpclient:async-http-client:2.11.0",
5454
"org.eclipse.jetty:jetty-http:%s" % jetty_version,
5555
"org.eclipse.jetty:jetty-security:%s" % jetty_version,
5656
"org.eclipse.jetty:jetty-server:%s" % jetty_version,
@@ -59,27 +59,23 @@ def selenium_java_deps():
5959
"org.eclipse.jetty:jetty-util:%s" % jetty_version,
6060
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
6161
"org.hamcrest:hamcrest:2.2",
62-
"org.mockito:mockito-core:3.2.4",
62+
"org.mockito:mockito-core:3.3.0",
6363
"org.slf4j:slf4j-jdk14:1.7.30",
64-
"org.testng:testng:6.14.3",
65-
"org.zeromq:jeromq:0.5.1",
64+
"org.testng:testng:7.1.0",
65+
"org.zeromq:jeromq:0.5.2",
6666
"xyz.rogfam:littleproxy:2.0.0-beta-5",
67-
maven.artifact(
68-
group = "org.seleniumhq.selenium",
69-
artifact = "htmlunit-driver",
70-
version = "2.36.0",
71-
exclusions = [
72-
"org.seleniumhq.selenium:selenium-api",
73-
"org.seleniumhq.selenium:selenium-remote-driver",
74-
"org.seleniumhq.selenium:selenium-support",
75-
],
76-
),
67+
"org.seleniumhq.selenium:htmlunit-driver:2.38.0",
7768
],
7869
excluded_artifacts = [
7970
"org.hamcrest:hamcrest-all", # Replaced by hamcrest 2
8071
"org.hamcrest:hamcrest-core",
8172
"io.netty:netty-all", # Depend on the actual things you need
8273
],
74+
override_targets = {
75+
"org.seleniumhq.selenium:selenium-api": "@//java/client/src/org/openqa/selenium:core",
76+
"org.seleniumhq.selenium:selenium-remote-driver": "@//java/client/src/org/openqa/selenium/remote:remote",
77+
"org.seleniumhq.selenium:selenium-support": "@//java/client/src/org/openqa/selenium/support",
78+
},
8379
fail_on_missing_checksum = True,
8480
fetch_sources = True,
8581
strict_visibility = True,

0 commit comments

Comments
 (0)