Skip to content

Commit aff69c0

Browse files
committed
[build] fix code to properly update maven artifacts
1 parent 55050f8 commit aff69c0

File tree

3 files changed

+196
-176
lines changed

3 files changed

+196
-176
lines changed

MODULE.bazel

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -172,55 +172,56 @@ maven.install(
172172
artifacts = [
173173
"com.beust:jcommander:1.82",
174174
"com.github.javaparser:javaparser-core:3.26.3",
175-
"com.github.spotbugs:spotbugs:4.9.1",
175+
"com.github.spotbugs:spotbugs:4.9.3",
176176
"com.github.stephenc.jcip:jcip-annotations:1.0-1",
177+
"com.google.code.findbugs:jsr305:3.0.2",
177178
"com.google.code.gson:gson:2.12.1",
178179
"com.google.guava:guava:33.4.0-jre",
179180
"com.google.auto:auto-common:1.2.2",
180181
"com.google.auto.service:auto-service:1.1.1",
181182
"com.google.auto.service:auto-service-annotations:1.1.1",
182-
"com.google.googlejavaformat:google-java-format:jar:1.25.2",
183+
"com.google.googlejavaformat:google-java-format:1.25.2",
183184
"com.graphql-java:graphql-java:22.3",
184185
"dev.failsafe:failsafe:3.3.2",
185-
"io.grpc:grpc-context:1.70.0",
186-
"io.lettuce:lettuce-core:6.5.4.RELEASE",
187-
"io.netty:netty-buffer",
188-
"io.netty:netty-codec-http",
189-
"io.netty:netty-codec-http2",
190-
"io.netty:netty-common",
191-
"io.netty:netty-handler",
192-
"io.netty:netty-handler-proxy",
193-
"io.netty:netty-transport",
194-
"io.opentelemetry:opentelemetry-api",
195-
"io.opentelemetry:opentelemetry-context",
196-
"io.opentelemetry:opentelemetry-exporter-logging",
197-
"io.opentelemetry:opentelemetry-sdk",
198-
"io.opentelemetry:opentelemetry-sdk-common",
199-
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure",
200-
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi",
201-
"io.opentelemetry:opentelemetry-sdk-testing",
202-
"io.opentelemetry:opentelemetry-sdk-trace",
186+
"io.grpc:grpc-context:1.71.0",
187+
"io.lettuce:lettuce-core:6.5.5.RELEASE",
188+
"io.netty:netty-buffer:4.1.119.Final",
189+
"io.netty:netty-codec-http:4.1.119.Final",
190+
"io.netty:netty-codec-http2:4.1.119.Final",
191+
"io.netty:netty-common:4.1.119.Final",
192+
"io.netty:netty-handler:4.1.119.Final",
193+
"io.netty:netty-handler-proxy:4.1.119.Final",
194+
"io.netty:netty-transport:4.1.119.Final",
195+
"io.opentelemetry:opentelemetry-api:1.48.0",
196+
"io.opentelemetry:opentelemetry-context:1.48.0",
197+
"io.opentelemetry:opentelemetry-exporter-logging:1.48.0",
198+
"io.opentelemetry:opentelemetry-sdk:1.48.0",
199+
"io.opentelemetry:opentelemetry-sdk-common:1.48.0",
200+
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.48.0",
201+
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.48.0",
202+
"io.opentelemetry:opentelemetry-sdk-testing:1.48.0",
203+
"io.opentelemetry:opentelemetry-sdk-trace:1.48.0",
203204
"it.ozimov:embedded-redis:0.7.3",
204-
"net.bytebuddy:byte-buddy:1.15.11",
205-
"org.htmlunit:htmlunit-core-js:4.7.0",
205+
"net.bytebuddy:byte-buddy:1.17.2",
206+
"org.htmlunit:htmlunit-core-js:4.10.0",
206207
"org.apache.commons:commons-exec:1.4.0",
207208
"org.apache.logging.log4j:log4j-core:2.24.3",
208-
"org.assertj:assertj-core:3.27.2",
209-
"org.bouncycastle:bcpkix-jdk18on:1.79",
209+
"org.assertj:assertj-core:3.27.3",
210+
"org.bouncycastle:bcpkix-jdk18on:1.80",
210211
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
211212
"org.hsqldb:hsqldb:2.7.4",
212213
"org.jspecify:jspecify:1.0.0",
213-
"org.junit.jupiter:junit-jupiter-api",
214-
"org.junit.jupiter:junit-jupiter-engine",
215-
"org.junit.jupiter:junit-jupiter-params",
216-
"org.junit.platform:junit-platform-launcher",
217-
"org.junit.platform:junit-platform-reporting",
218-
"org.junit.platform:junit-platform-commons",
219-
"org.junit.platform:junit-platform-engine",
220-
"org.mockito:mockito-core:5.15.2",
221-
"org.redisson:redisson:3.41.0",
222-
"org.slf4j:slf4j-api:2.0.16",
223-
"org.slf4j:slf4j-jdk14:2.0.16",
214+
"org.junit.jupiter:junit-jupiter-api:5.12.1",
215+
"org.junit.jupiter:junit-jupiter-engine:5.12.1",
216+
"org.junit.jupiter:junit-jupiter-params:5.12.1",
217+
"org.junit.platform:junit-platform-launcher:1.12.1",
218+
"org.junit.platform:junit-platform-reporting:1.12.1",
219+
"org.junit.platform:junit-platform-commons:1.12.1",
220+
"org.junit.platform:junit-platform-engine:1.12.1",
221+
"org.mockito:mockito-core:5.16.1",
222+
"org.redisson:redisson:3.45.0",
223+
"org.slf4j:slf4j-api:2.0.17",
224+
"org.slf4j:slf4j-jdk14:2.0.17",
224225
"org.tomlj:tomlj:1.1.1",
225226
"org.zeromq:jeromq:0.6.0",
226227
],

Rakefile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -893,22 +893,19 @@ namespace :java do
893893

894894
file_path = 'MODULE.bazel'
895895
content = File.read(file_path)
896-
# For some reason ./go wrapper is not outputting from Open3, so cannot use Bazel class directly
897-
output = `bazel run @maven//:outdated`
898-
899-
output.scan(/\S+ \[\S+-alpha\]/).each do |match|
900-
puts "WARNING — Cannot automatically update alpha version of: #{match}"
896+
output = nil
897+
Bazel.execute('run', [], '@maven//:outdated') do |out|
898+
output = out
901899
end
902900

903901
versions = output.scan(/(\S+) \[\S+ -> (\S+)\]/).to_h
904902
versions.each do |artifact, version|
905903
if artifact.match?('graphql')
904+
# https://github.com/graphql-java/graphql-java/discussions/3187
906905
puts 'WARNING — Cannot automatically update graphql'
907906
next
908907
end
909-
910-
replacement = artifact.include?('googlejavaformat') ? "#{artifact}:jar:#{version}" : "#{artifact}:#{version}"
911-
content.gsub!(/#{artifact}:(jar:)?\d+\.\d+[^\\"]+/, replacement)
908+
content.sub!(/#{Regexp.escape(artifact)}:([\d.-]+(?:[-.]?[A-Za-z0-9]+)*)/, "#{artifact}:#{version}")
912909
end
913910
File.write(file_path, content)
914911

0 commit comments

Comments
 (0)