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/devtools/gerrit/BUILD b/devtools/gerrit/BUILD
index 79cf6cb..4c8b240 100644
--- a/devtools/gerrit/BUILD
+++ b/devtools/gerrit/BUILD
@@ -2,7 +2,7 @@
container_image(
name = "with_plugins",
- base = "@gerrit-3.3.2//image",
+ base = "@gerrit-3.7.5//image",
# we cannot drop it directly in /var/gerrit/plugins as that changes the
# directory owner to 0:0 and then breaks the gerrit installer that wants
# to overwrite plugins.
@@ -14,30 +14,8 @@
)
container_image(
- name = "with_theme",
+ name = "3.7.5-r4",
base = ":with_plugins",
- directory = "/var/gerrit-theme",
- files = [
- "theme/etc/GerritSite.css",
- "theme/static/pepper-icon.png",
- ],
-)
-
-# Add gerrit 3.3.2 with backported fix. See org_q3k_gerrit_3_3_2_backport in
-# WORKSPACE for more background.
-# TODO(q3k): drop once gerrit > 3.3.2 lands.
-container_image(
- name = "with_gerrit_override",
- base = "with_theme",
- directory = "/var/gerrit/bin/",
- files = [
- "@org_q3k_gerrit_3_3_2_backport//file:gerrit.war",
- ],
-)
-
-container_image(
- name = "3.3.2-r4",
- base = ":with_gerrit_override",
directory = "/",
entrypoint = ["/entrypoint.sh"],
files = [":entrypoint.sh"],
@@ -46,8 +24,8 @@
container_push(
name = "push",
format = "Docker",
- image = ":3.3.2-r4",
+ image = ":3.7.5-r4",
registry = "registry.k0.hswaw.net",
repository = "q3k/gerrit",
- tag = "3.3.2-r4",
+ tag = "3.7.5-r4",
)