Skip to content

Commit

Permalink
[build] update maven dependency versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@titusfortner
titusfortner committed Dec 22, 2023
1 parent 0309e51 commit 4a535ec
Show file tree
Hide file tree
Showing 2 changed files with 286 additions and 351 deletions.
76 changes: 38 additions & 38 deletions java/maven_deps.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,60 +5,60 @@ def selenium_java_deps():
maven_install(
artifacts = [
"com.beust:jcommander:1.82",
"com.github.javaparser:javaparser-core:3.25.4",
"com.github.spotbugs:spotbugs:4.7.3",
"com.github.javaparser:javaparser-core:3.25.7",
"com.github.spotbugs:spotbugs:4.8.3",
"com.github.stephenc.jcip:jcip-annotations:1.0-1",
"com.google.code.gson:gson:2.10.1",
"com.google.guava:guava:32.1.2-jre",
"com.google.guava:guava:33.0.0-jre",
"com.google.auto:auto-common:1.2.2",
"com.google.auto.service:auto-service:1.1.1",
"com.google.auto.service:auto-service-annotations:1.1.1",
"com.google.googlejavaformat:google-java-format:jar:1.17.0",
"com.google.googlejavaformat:google-java-format:jar:1.19.1",
"com.graphql-java:graphql-java:20.2",
"com.graphql-java:java-dataloader:3.2.0",
"dev.failsafe:failsafe:3.3.2",
"io.grpc:grpc-context:1.57.1",
"io.lettuce:lettuce-core:6.2.5.RELEASE",
"io.netty:netty-buffer:4.1.100.Final",
"io.netty:netty-codec-http:4.1.100.Final",
"io.netty:netty-codec-http2:4.1.100.Final",
"io.netty:netty-common:4.1.100.Final",
"io.netty:netty-handler:4.1.100.Final",
"io.netty:netty-handler-proxy:4.1.100.Final",
"io.netty:netty-transport:4.1.100.Final",
"io.opentelemetry:opentelemetry-api:1.28.0",
"io.opentelemetry:opentelemetry-context:1.28.0",
"io.opentelemetry:opentelemetry-exporter-logging:1.28.0",
"io.opentelemetry:opentelemetry-sdk:1.28.0",
"io.opentelemetry:opentelemetry-sdk-common:1.28.0",
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.28.0",
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.28.0",
"io.opentelemetry:opentelemetry-sdk-testing:1.28.0",
"io.opentelemetry:opentelemetry-sdk-trace:1.28.0",
"io.grpc:grpc-context:1.60.1",
"io.lettuce:lettuce-core:6.3.0.RELEASE",
"io.netty:netty-buffer:4.1.104.Final",
"io.netty:netty-codec-http:4.1.104.Final",
"io.netty:netty-codec-http2:4.1.104.Final",
"io.netty:netty-common:4.1.104.Final",
"io.netty:netty-handler:4.1.104.Final",
"io.netty:netty-handler-proxy:4.1.104.Final",
"io.netty:netty-transport:4.1.104.Final",
"io.opentelemetry:opentelemetry-api:1.33.0",
"io.opentelemetry:opentelemetry-context:1.33.0",
"io.opentelemetry:opentelemetry-exporter-logging:1.33.0",
"io.opentelemetry:opentelemetry-sdk:1.33.0",
"io.opentelemetry:opentelemetry-sdk-common:1.33.0",
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.33.0",
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.33.0",
"io.opentelemetry:opentelemetry-sdk-testing:1.33.0",
"io.opentelemetry:opentelemetry-sdk-trace:1.33.0",
"io.opentelemetry.semconv:opentelemetry-semconv:1.23.1-alpha",
"io.ous:jtoml:2.0.0",
"it.ozimov:embedded-redis:0.7.3",
"net.bytebuddy:byte-buddy:1.14.5",
"net.bytebuddy:byte-buddy:1.14.11",
"org.htmlunit:htmlunit-core-js:3.9.0",
"org.apache.commons:commons-exec:1.3",
"org.apache.logging.log4j:log4j-core:2.20.0",
"org.apache.logging.log4j:log4j-core:2.22.0",
"org.assertj:assertj-core:3.24.2",
"org.bouncycastle:bcpkix-jdk18on:1.76",
"org.bouncycastle:bcpkix-jdk18on:1.77",
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
"org.hsqldb:hsqldb:2.7.2",
"org.junit.jupiter:junit-jupiter-api:5.10.0",
"org.junit.jupiter:junit-jupiter-engine:5.10.0",
"org.junit.jupiter:junit-jupiter-params:5.10.0",
"org.junit.platform:junit-platform-launcher:1.10.0",
"org.junit.platform:junit-platform-reporting:1.10.0",
"org.junit.platform:junit-platform-commons:1.10.0",
"org.junit.platform:junit-platform-engine:1.10.0",
"org.mockito:mockito-core:4.11.0",
"org.mockito:mockito-inline:4.11.0",
"org.redisson:redisson:3.23.2",
"org.slf4j:slf4j-api:2.0.7",
"org.slf4j:slf4j-jdk14:2.0.7",
"org.zeromq:jeromq:0.5.3",
"org.junit.jupiter:junit-jupiter-api:5.10.1",
"org.junit.jupiter:junit-jupiter-engine:5.10.1",
"org.junit.jupiter:junit-jupiter-params:5.10.1",
"org.junit.platform:junit-platform-launcher:1.10.1",
"org.junit.platform:junit-platform-reporting:1.10.1",
"org.junit.platform:junit-platform-commons:1.10.1",
"org.junit.platform:junit-platform-engine:1.10.1",
"org.mockito:mockito-core:5.8.0",
"org.mockito:mockito-inline:5.2.0",
"org.redisson:redisson:3.25.2",
"org.slf4j:slf4j-api:2.0.9",
"org.slf4j:slf4j-jdk14:2.0.9",
"org.zeromq:jeromq:0.5.4",
],
excluded_artifacts = [
"org.hamcrest:hamcrest-all", # Replaced by hamcrest 2
Expand Down
Loading

6 comments on commit 4a535ec

@joerg1985
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@titusfortner org.mockito:mockito-inline should be removed this is now included in org.mockito:mockito-core.
There have been some other issues with the mockito 5.x version the last time @diemol tried to update it.

I think the org.mockito.Mockito.spy did not work with JDK 17+.
The last time i had a look where this used, most usages could be replaced easily.

@titusfortner
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@joerg1985 can you remove those things from the .bzl file, then run ./go java:update and see if it does the right things? I'm just trying to automate the build process better so we can do releases and keep everything updated better.

@joerg1985
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I currently stuck at bazel 5, due to vbatts/copr-build-bazel#22. Had to monkey patch the WORKSPACE to run it with bazel 5, so i am not sure this will give valid results. But i will try after christmas and see what happens.

@joerg1985
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@titusfortner looks like the ./go java:update does not work for me:

joerg@mybox:~/projects/SeleniumHQ$ ./go java:update
Loading: 
Loading: 0 packages loaded
INFO: Repository maven instantiated at:
  /home/joerg/projects/SeleniumHQ/WORKSPACE:162:19: in <toplevel>
  /home/joerg/projects/SeleniumHQ/java/maven_deps.bzl:4:18: in selenium_java_deps
  /home/joerg/.cache/bazel/_bazel_joerg/bf13d6851340405f87a84645afdd18e5/external/rules_jvm_external/private/rules/maven_install.bzl:133:30: in maven_install
Repository rule pinned_coursier_fetch defined at:
  /home/joerg/.cache/bazel/_bazel_joerg/bf13d6851340405f87a84645afdd18e5/external/rules_jvm_external/coursier.bzl:1156:40: in <toplevel>
ERROR: An error occurred during the fetch of repository 'maven':
   Traceback (most recent call last):
	File "/home/joerg/.cache/bazel/_bazel_joerg/bf13d6851340405f87a84645afdd18e5/external/rules_jvm_external/coursier.bzl", line 397, column 21, in _pinned_coursier_fetch_impl
		fail("%s_install.json contains an invalid input signature and must be regenerated. " % (repository_ctx.name) +
Error in fail: maven_install.json contains an invalid input signature and must be regenerated. This typically happens when the maven_install artifacts have been changed but not repinned. PLEASE DO NOT MODIFY THIS FILE DIRECTLY! To generate a new maven_install.json and re-pin the artifacts, either run:
 REPIN=1 bazel run @unpinned_maven//:pin
or:
 1) Set 'fail_if_repin_required' to 'False' in 'maven_install'
 2) Run 'bazel run @unpinned_maven//:pin'
 3) Reset 'fail_if_repin_required' to 'True' in 'maven_install'

ERROR: /home/joerg/projects/SeleniumHQ/WORKSPACE:162:19: fetching pinned_coursier_fetch rule //external:maven: Traceback (most recent call last):
	File "/home/joerg/.cache/bazel/_bazel_joerg/bf13d6851340405f87a84645afdd18e5/external/rules_jvm_external/coursier.bzl", line 397, column 21, in _pinned_coursier_fetch_impl
		fail("%s_install.json contains an invalid input signature and must be regenerated. " % (repository_ctx.name) +
Error in fail: maven_install.json contains an invalid input signature and must be regenerated. This typically happens when the maven_install artifacts have been changed but not repinned. PLEASE DO NOT MODIFY THIS FILE DIRECTLY! To generate a new maven_install.json and re-pin the artifacts, either run:
 REPIN=1 bazel run @unpinned_maven//:pin
or:
 1) Set 'fail_if_repin_required' to 'False' in 'maven_install'
 2) Run 'bazel run @unpinned_maven//:pin'
 3) Reset 'fail_if_repin_required' to 'True' in 'maven_install'

ERROR: no such package '@maven//': maven_install.json contains an invalid input signature and must be regenerated. This typically happens when the maven_install artifacts have been changed but not repinned. PLEASE DO NOT MODIFY THIS FILE DIRECTLY! To generate a new maven_install.json and re-pin the artifacts, either run:
 REPIN=1 bazel run @unpinned_maven//:pin
or:
 1) Set 'fail_if_repin_required' to 'False' in 'maven_install'
 2) Run 'bazel run @unpinned_maven//:pin'
 3) Reset 'fail_if_repin_required' to 'True' in 'maven_install'

INFO: Elapsed time: 0.755s
INFO: 0 processes.
FAILED: Build did NOT complete successfully (0 packages loaded)
ERROR: Build failed. Not running target
FAILED: Build did NOT complete successfully (0 packages loaded)
go aborted!
Errno::EBADF: Bad file descriptor - bazel
/home/joerg/projects/SeleniumHQ/rake_tasks/bazel.rb:29:in `execute'
/home/joerg/projects/SeleniumHQ/Rakefile:857:in `block in <main>'
org/jruby/ext/monitor/Monitor.java:82:in `synchronize'
Tasks: TOP => java:update
(See full trace by running task with --trace)

@titusfortner
Copy link
Member Author

@titusfortner titusfortner commented on 4a535ec Dec 29, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@joerg1985
Is it failing on just bazel run @maven//:outdated?
Weird, what is in trunk right now should already be properly pinned...
I guess there is no harm in pinning before and after anyway. Try trunk now.

@titusfortner
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(what is in trunk right now is not the most up to date, so running ./go java:update should update those files).

Please sign in to comment.