gerrit: bump to 3.7.5
This involved messing with both of our source-built plugins (owners and
oauth).
The main issue seems to have been the desync between Jackson as
requested by different plugins. Jackson is split into multiple Maven
packages, and they all have to be the same version to work together. The
oauth plugin was requesting only part of it, and these parts were
incompatible with the parts that the owners plugin requested.
In addition, we have to make the owners plugin include more bits of
Jackson.
Without these changes, we would get runtime
`java.lang.NoClassDefFoundError: com/fasterxml/jackson/...` errors,
which were a symptom of Jackson either not being included fully into the
plugin's JAR, or a mixup between Jackson component/package versions.
While we're at it, we remove the broken theming attempt.
Change-Id: I26531818a395de2a8bb6054d2583881fd1d5b806
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1642
Reviewed-by: q3k <q3k@hackerspace.pl>
diff --git a/WORKSPACE b/WORKSPACE
index 82a3fde..826c28d 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -199,11 +199,11 @@
)
container_pull(
- name = "gerrit-3.3.2",
- digest = "sha256:f7fc8b749706f38475f94191117091973914a8f084e69518deff7dbc9c2c557d",
+ name = "gerrit-3.7.5",
+ digest = "sha256:3705f3cb365bf53a8e310dd7e09c8fb44a073e1266dc0e713b6fdc04c91ab9f2",
registry = "index.docker.io",
repository = "gerritcodereview/gerrit",
- tag = "3.3.2-ubuntu20",
+ tag = "3.7.5-ubuntu20",
)
# third_party/factorio
@@ -215,50 +215,34 @@
git_repository(
name = "com_googlesource_gerrit_bazlets",
- commit = "a511f3c90129d7de7ae67c0637001162980c08d5",
+ commit = "e68cc7a45d9ee2b100024b9b12533b50a4598585",
remote = "https://gerrit.googlesource.com/bazlets",
shallow_since = "1606931369 -0600",
- patch_args = ["-p1"],
- patches = [
- "//third_party:bazlets_py3.patch",
- ],
)
+# Force newer version of Gerrit plugin API.
load("@com_googlesource_gerrit_bazlets//:gerrit_api.bzl", "gerrit_api")
-
-gerrit_api()
+gerrit_api(
+ version = "3.7.5",
+ plugin_api_sha1 = "1ea41f95da74045c2cdb30d359041a79b61e72ff",
+ acceptance_framework_sha1 = "47019cf43ef7e6e8d2d5c0aeba0407d23c93bbbb",
+)
load("//devtools/gerrit/gerrit-oauth-provider:external_plugin_deps.bzl", gerrit_oauth_deps = "external_plugin_deps")
gerrit_oauth_deps(omit_commons_codec = False)
-# Gerrit 3.3.2 built by q3k, backported with fix for 'empty reviewers column' bug.
-# See: https://bugs.chromium.org/p/gerrit/issues/detail?id=13899
-# Override can be removed once we update to > 3.3.2, as the fix for this is
-# pending for the 3.3 branch.
-#
-# Built from v3.3.2 tag at df0507df5917fd78af01aee2495b2663530d52d1
-# Cherry-picked fix from 8731af3ae785efe9ecff7f3d04302b6b01c4fc0b
-# Resulted in commit 5949bfb86e62a32a95293e339ed86bfe52a283e9
-# Built against Java 8:
-# bazel build --java_toolchain //tools:error_prone_warnings_toolchain :release
-#
-http_file(
- name = "org_q3k_gerrit_3_3_2_backport",
- downloaded_file_path = "gerrit.war",
- sha256 = "d1839d691a8534f4ccb27bed9a98281e45972fbebec50d004cecd4d5da2b15a6",
- urls = [
- "https://object.ceph-waw3.hswaw.net/q3k-personal/d1839d691a8534f4ccb27bed9a98281e45972fbebec50d004cecd4d5da2b15a6.war",
- ],
-)
-
# Gerrit OWNERS plugins external repositories
git_repository(
name = "com_googlesource_gerrit_plugin_owners",
- commit = "17817c9e319073c03513f9d5177b6142b8fd567b",
+ commit = "6db2d3f048f56fa49469d315b716787d21f8393f",
remote = "https://gerrit.googlesource.com/plugins/owners/",
shallow_since = "1593642470 +0200",
+ patch_args = ["-p1"],
+ patches = [
+ "//third_party:gerrit_plugins_owner.patch",
+ ],
)
load("@com_googlesource_gerrit_plugin_owners//:external_plugin_deps_standalone.bzl", gerrit_owners_deps = "external_plugin_deps_standalone")