Skip to content

Commit 415786b

Browse files
committed
[bazel] Use Java 17 by default rather than Java 11
1 parent 05fe130 commit 415786b

File tree

28 files changed

+342
-55
lines changed

28 files changed

+342
-55
lines changed

.bazelrc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ build --flag_alias=headless=//common:headless
1111

1212
# Set the default java toolchain
1313

14-
build --java_language_version=11
15-
build --java_runtime_version=remotejdk_11
16-
build --tool_java_language_version=11
17-
build --tool_java_runtime_version=remotejdk_11
14+
build --java_language_version=17
15+
build --java_runtime_version=remotejdk_17
16+
build --tool_java_language_version=17
17+
build --tool_java_runtime_version=remotejdk_17
1818

1919
# We target java 8 by default
2020

java/maven_deps.bzl

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ def selenium_java_deps():
1919
"org.slf4j:slf4j-api",
2020
],
2121
),
22+
"com.github.stephenc.jcip:jcip-annotations:1.0-1",
2223
"com.google.code.gson:gson:2.10.1",
2324
"com.google.guava:guava:31.1-jre",
2425
"com.google.auto:auto-common:1.2.1",
@@ -27,6 +28,17 @@ def selenium_java_deps():
2728
"com.google.googlejavaformat:google-java-format:jar:1.17.0",
2829
"com.graphql-java:graphql-java:20.2",
2930
"com.graphql-java:java-dataloader:3.2.0",
31+
"dev.failsafe:failsafe:3.3.1",
32+
maven.artifact(
33+
group = "junit",
34+
artifact = "junit",
35+
version = "4.13.2",
36+
exclusions = [
37+
"org.hamcrest:hamcrest-all",
38+
"org.hamcrest:hamcrest-core",
39+
"org.hamcrest:hamcrest-library",
40+
],
41+
),
3042
"io.grpc:grpc-context:1.55.1",
3143
"io.lettuce:lettuce-core:6.2.4.RELEASE",
3244
"io.netty:netty-buffer:%s" % netty_version,
@@ -58,29 +70,10 @@ def selenium_java_deps():
5870
"io.opentelemetry:opentelemetry-sdk-trace:%s" % opentelemetry_version,
5971
"io.ous:jtoml:2.0.0",
6072
"it.ozimov:embedded-redis:0.7.3",
61-
maven.artifact(
62-
group = "junit",
63-
artifact = "junit",
64-
version = "4.13.2",
65-
exclusions = [
66-
"org.hamcrest:hamcrest-all",
67-
"org.hamcrest:hamcrest-core",
68-
"org.hamcrest:hamcrest-library",
69-
],
70-
),
71-
"org.junit.jupiter:junit-jupiter-api:%s" % junit_jupiter_version,
72-
"org.junit.jupiter:junit-jupiter-engine:%s" % junit_jupiter_version,
73-
"org.junit.jupiter:junit-jupiter-params:%s" % junit_jupiter_version,
74-
"org.junit.platform:junit-platform-launcher:%s" % junit_platform_version,
75-
"org.junit.platform:junit-platform-reporting:%s" % junit_platform_version,
76-
"org.junit.platform:junit-platform-commons:%s" % junit_platform_version,
77-
"org.junit.platform:junit-platform-engine:%s" % junit_platform_version,
78-
"org.junit.platform:junit-platform-suite-engine:%s" % junit_platform_version,
79-
"org.junit.platform:junit-platform-suite-api:%s" % junit_platform_version,
8073
"net.bytebuddy:byte-buddy:1.14.4",
81-
"dev.failsafe:failsafe:3.3.1",
8274
"net.sourceforge.htmlunit:htmlunit-core-js:2.70.0",
8375
"org.apache.commons:commons-exec:1.3",
76+
"org.apache.logging.log4j:log4j-core:2.20.0",
8477
"org.assertj:assertj-core:3.24.2",
8578
maven.artifact(
8679
group = "org.asynchttpclient",
@@ -91,18 +84,26 @@ def selenium_java_deps():
9184
"io.netty:netty-transport-native-kqueue",
9285
],
9386
),
87+
"org.bouncycastle:bcpkix-jdk15on:1.70",
9488
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
9589
"org.hamcrest:hamcrest:2.2",
9690
"org.hsqldb:hsqldb:2.7.1",
91+
"org.junit.jupiter:junit-jupiter-api:%s" % junit_jupiter_version,
92+
"org.junit.jupiter:junit-jupiter-engine:%s" % junit_jupiter_version,
93+
"org.junit.jupiter:junit-jupiter-params:%s" % junit_jupiter_version,
94+
"org.junit.platform:junit-platform-launcher:%s" % junit_platform_version,
95+
"org.junit.platform:junit-platform-reporting:%s" % junit_platform_version,
96+
"org.junit.platform:junit-platform-commons:%s" % junit_platform_version,
97+
"org.junit.platform:junit-platform-engine:%s" % junit_platform_version,
98+
"org.junit.platform:junit-platform-suite-engine:%s" % junit_platform_version,
99+
"org.junit.platform:junit-platform-suite-api:%s" % junit_platform_version,
97100
"org.mockito:mockito-core:4.11.0",
98101
"org.mockito:mockito-inline:4.11.0",
102+
"org.redisson:redisson:3.21.1",
103+
"org.seleniumhq.selenium:htmlunit-driver:4.9.0",
99104
"org.slf4j:slf4j-api:2.0.7",
100105
"org.slf4j:slf4j-jdk14:2.0.7",
101-
"org.apache.logging.log4j:log4j-core:2.20.0",
102106
"org.zeromq:jeromq:0.5.3",
103-
"org.seleniumhq.selenium:htmlunit-driver:4.9.0",
104-
"org.redisson:redisson:3.21.1",
105-
"com.github.stephenc.jcip:jcip-annotations:1.0-1",
106107
],
107108
excluded_artifacts = [
108109
"org.hamcrest:hamcrest-all", # Replaced by hamcrest 2

0 commit comments

Comments
 (0)