Rename external_plugin_deps.bzl, not needed for in-tree build All test dependencies are already available in Gerrit core in a newer version. Hence use them for the stand-alone build only and update them to the versions used in Gerrit core: - mockito 5.6.0 - bytebuddy 1.14.9 - objenesis 3.0.1 Also update - bazel to 6.3.2 - bazlets to f9c119e45d - plugin API to 3.7.0 Change-Id: I89c029b2b6dcc7c54dcf0205d1d04bb115081d5e
diff --git a/.bazelversion b/.bazelversion index 7c69a55..91e4a9f 100644 --- a/.bazelversion +++ b/.bazelversion
@@ -1 +1 @@ -3.7.0 +6.3.2
diff --git a/WORKSPACE b/WORKSPACE index 8ec9ae8..81722a0 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -3,7 +3,7 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "a511f3c90129d7de7ae67c0637001162980c08d5", + commit = "f9c119e45d9a241bee720b7fbd6c7fdbc952da5f", #local_path = "/home/<user>/projects/bazlets", ) @@ -12,8 +12,9 @@ "gerrit_api", ) -gerrit_api(version = "3.3.0") +gerrit_api(version = "3.7.0", + plugin_api_sha1 = "95ceafdaea39b21b0998d5b9109a2aaf4d4be83b", + acceptance_framework_sha1 = "1546658913a21996b7635f832aac44a7ca3554c6") +load("//:deps.bzl", "deps") -load("//:external_plugin_deps.bzl", "external_plugin_deps") - -external_plugin_deps() +deps()
diff --git a/deps.bzl b/deps.bzl new file mode 100644 index 0000000..6ceeab7 --- /dev/null +++ b/deps.bzl
@@ -0,0 +1,33 @@ +load("//tools/bzl:maven_jar.bzl", "maven_jar") + +def deps(): + maven_jar( + name = "mockito", + artifact = "org.mockito:mockito-core:5.6.0", + sha1 = "550b7a0eb22e1d72d33dcc2e5ef6954f73100d76", + deps = [ + "@bytebuddy//jar", + "@bytebuddy-agent//jar", + "@objenesis//jar", + ], + ) + + BYTE_BUDDY_VERSION = "1.14.9" + + maven_jar( + name = "bytebuddy", + artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION, + sha1 = "b69e7fff6c473d3ed2b489cdfd673a091fd94226", + ) + + maven_jar( + name = "bytebuddy-agent", + artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, + sha1 = "dfb8707031008535048bad2b69735f46d0b6c5e5", + ) + + maven_jar( + name = "objenesis", + artifact = "org.objenesis:objenesis:3.0.1", + sha1 = "11cfac598df9dc48bb9ed9357ed04212694b7808", + )
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl deleted file mode 100644 index c1932a9..0000000 --- a/external_plugin_deps.bzl +++ /dev/null
@@ -1,33 +0,0 @@ -load("//tools/bzl:maven_jar.bzl", "maven_jar") - -def external_plugin_deps(): - maven_jar( - name = "mockito", - artifact = "org.mockito:mockito-core:2.28.2", - sha1 = "91110215a8cb9b77a46e045ee758f77d79167cc0", - deps = [ - "@byte-buddy//jar", - "@byte-buddy-agent//jar", - "@objenesis//jar", - ], - ) - - BYTE_BUDDY_VERSION = "1.9.10" - - maven_jar( - name = "byte-buddy", - artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION, - sha1 = "211a2b4d3df1eeef2a6cacf78d74a1f725e7a840", - ) - - maven_jar( - name = "byte-buddy-agent", - artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, - sha1 = "9674aba5ee793e54b864952b001166848da0f26b", - ) - - maven_jar( - name = "objenesis", - artifact = "org.objenesis:objenesis:2.6", - sha1 = "639033469776fd37c08358c6b92a4761feb2af4b", - )