Skip to content

Commit f392b39

Browse files
authored
Bump java deps (#310)
Builds on #309
1 parent 974602f commit f392b39

File tree

14 files changed

+476
-274
lines changed

14 files changed

+476
-274
lines changed

.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ build --java_language_version=17
1111
build --tool_java_runtime_version=remotejdk_17
1212
build --tool_java_language_version=17
1313

14+
build --experimental_strict_java_deps=strict
15+
build --explicit_java_test_deps
16+
1417
# Make sure we get something helpful when tests fail
1518
test --verbose_failures
1619
test --test_output=errors

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.4.0
1+
7.5.0

MODULE.bazel

Lines changed: 47 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ bazel_dep(
5151
)
5252
bazel_dep(
5353
name = "rules_jvm_external",
54-
version = "6.5",
54+
version = "6.6",
5555
)
5656
bazel_dep(
5757
name = "rules_proto",
@@ -103,28 +103,26 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
103103
"com.google.auto.value:auto-value:1.9",
104104
"com.google.code.findbugs:jsr305:3.0.2",
105105
"com.google.code.gson:gson:2.9.0",
106-
"com.google.errorprone:error_prone_annotations:2.11.0",
107106
"com.google.guava:failureaccess:1.0.1",
108-
"com.google.guava:guava:31.0.1-android",
109107
"com.google.j2objc:j2objc-annotations:1.3",
110108
"com.google.re2j:re2j:1.6",
111109
"com.google.truth:truth:1.0.1",
112110
"com.squareup.okhttp:okhttp:2.7.5",
113111
"com.squareup.okio:okio:1.17.5",
114-
"io.netty:netty-buffer:4.1.87.Final",
115-
"io.netty:netty-codec-http2:4.1.87.Final",
116-
"io.netty:netty-codec-http:4.1.87.Final",
117-
"io.netty:netty-codec-socks:4.1.87.Final",
118-
"io.netty:netty-codec:4.1.87.Final",
119-
"io.netty:netty-common:4.1.87.Final",
120-
"io.netty:netty-handler-proxy:4.1.87.Final",
121-
"io.netty:netty-handler:4.1.87.Final",
122-
"io.netty:netty-resolver:4.1.87.Final",
112+
"io.netty:netty-buffer",
113+
"io.netty:netty-codec-http2",
114+
"io.netty:netty-codec-http",
115+
"io.netty:netty-codec-socks",
116+
"io.netty:netty-codec",
117+
"io.netty:netty-common",
118+
"io.netty:netty-handler-proxy",
119+
"io.netty:netty-handler",
120+
"io.netty:netty-resolver",
123121
"io.netty:netty-tcnative-boringssl-static:2.0.56.Final",
124122
"io.netty:netty-tcnative-classes:2.0.56.Final",
125123
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.87.Final",
126-
"io.netty:netty-transport-native-unix-common:4.1.87.Final",
127-
"io.netty:netty-transport:4.1.87.Final",
124+
"io.netty:netty-transport-native-unix-common",
125+
"io.netty:netty-transport",
128126
"io.opencensus:opencensus-api:0.24.0",
129127
"io.opencensus:opencensus-contrib-grpc-metrics:0.24.0",
130128
"io.perfmark:perfmark-api:0.25.0",
@@ -133,49 +131,62 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
133131
"org.codehaus.mojo:animal-sniffer-annotations:1.21",
134132
]
135133

134+
slf4j_version = "1.7.32"
135+
136+
spotbugs_version = "4.8.6"
137+
136138
maven.install(
137139
name = "contrib_rules_jvm_deps",
138140
artifacts = [
141+
"com.github.spotbugs:spotbugs-annotations:%s" % spotbugs_version,
139142
"com.google.code.findbugs:jsr305:3.0.2",
140-
"com.google.errorprone:error_prone_annotations:2.11.0",
141-
"com.google.guava:guava:30.1.1-jre",
142-
"commons-cli:commons-cli:1.5.0",
143-
"io.grpc:grpc-api:1.40.0",
144-
"io.grpc:grpc-core:1.40.0",
145-
"io.grpc:grpc-netty:1.40.0",
146-
"io.grpc:grpc-services:1.40.0",
147-
"io.grpc:grpc-stub:1.40.0",
148-
"org.slf4j:slf4j-simple:1.7.32",
149-
"com.google.googlejavaformat:google-java-format:1.15.0",
143+
"com.google.errorprone:error_prone_annotations:2.35.1",
144+
"com.google.googlejavaformat:google-java-format:1.24.0",
145+
"com.google.guava:guava:33.3.1-jre",
146+
"commons-cli:commons-cli:1.9.0",
147+
"io.grpc:grpc-api",
148+
"io.grpc:grpc-core",
149+
"io.grpc:grpc-netty",
150+
"io.grpc:grpc-services",
151+
"io.grpc:grpc-stub",
150152

151153
# These can be versioned independently of the versions in `repositories.bzl`
152154
# so long as the version numbers are higher.
153-
"org.junit.jupiter:junit-jupiter-engine:5.8.2",
154-
"org.junit.jupiter:junit-jupiter-api:5.8.2",
155-
"org.junit.platform:junit-platform-launcher:1.8.2",
156-
"org.junit.platform:junit-platform-reporting:1.8.2",
157-
"org.junit.vintage:junit-vintage-engine:5.8.2",
155+
"org.junit.jupiter:junit-jupiter-engine",
156+
"org.junit.jupiter:junit-jupiter-api",
157+
"org.junit.platform:junit-platform-launcher",
158+
"org.junit.platform:junit-platform-reporting",
159+
"org.junit.vintage:junit-vintage-engine",
158160

159161
# Open Test Alliance for the JVM dep
160-
"org.opentest4j:opentest4j:1.2.0",
162+
"org.opentest4j:opentest4j:1.3.0",
161163

162164
# Checkstyle deps
163-
"com.puppycrawl.tools:checkstyle:10.20.0",
165+
"com.puppycrawl.tools:checkstyle:10.20.2",
164166

165167
# PMD deps
166-
"net.sourceforge.pmd:pmd-dist:7.7.0",
168+
"net.sourceforge.pmd:pmd-dist:7.8.0",
167169

168170
# Spotbugs deps
169-
"org.slf4j:slf4j-api:1.7.32",
170-
"org.slf4j:slf4j-jdk14:1.7.32",
171+
"org.slf4j:slf4j-api:%s" % slf4j_version,
172+
"org.slf4j:slf4j-jdk14:%s" % slf4j_version,
173+
174+
# Used by us at runtime
175+
"org.slf4j:slf4j-simple:%s" % slf4j_version,
171176

172177
# We explicitly declare a protobuf runtime version
173178
# so that it coincides with the one we use to generate the code.
174179
"com.google.protobuf:protobuf-java:{}".format(PROTOBUF_JAVA_VERSION),
175180
] + IO_GRPC_GRPC_JAVA_ARTIFACTS,
181+
boms = [
182+
"io.grpc:grpc-bom:1.68.2",
183+
"io.netty:netty-bom:4.1.87.Final",
184+
"org.junit:junit-bom:5.11.3",
185+
],
176186
fail_if_repin_required = True,
177187
generate_compat_repositories = True,
178188
lock_file = "//:contrib_rules_jvm_deps_install.json",
189+
resolver = "maven",
179190
strict_visibility = False,
180191
)
181192

@@ -189,7 +200,7 @@ maven.artifact(
189200
artifact = "spotbugs",
190201
exclusions = ["org.slf4j:slf4j-api"],
191202
group = "com.github.spotbugs",
192-
version = "4.7.0",
203+
version = spotbugs_version,
193204
)
194205
use_repo(
195206
maven,
@@ -228,6 +239,7 @@ dev_maven.install(
228239
],
229240
fail_if_repin_required = True,
230241
fetch_sources = True,
242+
lock_file = "//:contrib_rules_jvm_tests_install.json",
231243
)
232244
use_repo(
233245
dev_maven,

0 commit comments

Comments
 (0)