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/third_party/gerrit_plugins_owner.patch b/third_party/gerrit_plugins_owner.patch
new file mode 100644
index 0000000..257b6fb
--- /dev/null
+++ b/third_party/gerrit_plugins_owner.patch
@@ -0,0 +1,124 @@
+Synchronzies Jackson version with oauth plugin, bumps API to 3.7.
+
+diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
+index 5ad1930..712e0d3 100644
+--- a/external_plugin_deps.bzl
++++ b/external_plugin_deps.bzl
+@@ -1,30 +1,30 @@
+ load("//tools/bzl:maven_jar.bzl", "maven_jar")
+
+-JACKSON_VER = "2.9.7"
++JACKSON_VER = "2.10.2"
+
+ def external_plugin_deps():
+ maven_jar(
+ name = "jackson-core",
+ artifact = "com.fasterxml.jackson.core:jackson-core:" + JACKSON_VER,
+- sha1 = "4b7f0e0dc527fab032e9800ed231080fdc3ac015",
++ sha1 = "73d4322a6bda684f676a2b5fe918361c4e5c7cca",
+ )
+
+ maven_jar(
+ name = "jackson-databind",
+ artifact = "com.fasterxml.jackson.core:jackson-databind:" + JACKSON_VER,
+- sha1 = "e6faad47abd3179666e89068485a1b88a195ceb7",
++ sha1 = "0528de95f198afafbcfb0c09d2e43b6e0ea663ec",
+ )
+
+ maven_jar(
+ name = "jackson-annotations",
+ artifact = "com.fasterxml.jackson.core:jackson-annotations:" + JACKSON_VER,
+- sha1 = "4b838e5c4fc17ac02f3293e9a558bb781a51c46d",
++ sha1 = "3a13b6105946541b8d4181a0506355b5fae63260",
+ )
+
+ maven_jar(
+ name = "jackson-dataformat-yaml",
+ artifact = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:" + JACKSON_VER,
+- sha1 = "a428edc4bb34a2da98a50eb759c26941d4e85960",
++ sha1 = "8a6a6ad573b48dc3b623414719428ecbfeb259a3",
+ )
+
+ maven_jar(
+diff --git a/external_plugin_deps_standalone.bzl b/external_plugin_deps_standalone.bzl
+index b2964a5..9f56994 100644
+--- a/external_plugin_deps_standalone.bzl
++++ b/external_plugin_deps_standalone.bzl
+@@ -5,7 +5,7 @@ PROLOG_VERS = "1.4.3"
+ PROLOG_REPO = GERRIT
+
+ def external_plugin_deps_standalone():
+- external_plugin_deps(omit_jackson_core = False)
++ external_plugin_deps()
+
+ maven_jar(
+ name = "prolog-runtime",
+diff --git a/owners/src/main/java/com/googlesource/gerrit/owners/OwnerPredicateProvider.java b/owners/src/main/java/com/googlesource/gerrit/owners/OwnerPredicateProvider.java
+index b83d7a8..d15da8e 100644
+--- a/owners/src/main/java/com/googlesource/gerrit/owners/OwnerPredicateProvider.java
++++ b/owners/src/main/java/com/googlesource/gerrit/owners/OwnerPredicateProvider.java
+@@ -18,7 +18,7 @@ package com.googlesource.gerrit.owners;
+
+ import com.google.common.collect.ImmutableSet;
+ import com.google.gerrit.extensions.annotations.Listen;
+-import com.google.gerrit.server.rules.prolog.PredicateProvider;
++import com.google.gerrit.server.rules.PredicateProvider;
+ import com.google.inject.Inject;
+ import com.googlesource.gerrit.owners.common.Accounts;
+ import com.googlesource.gerrit.owners.common.PathOwnersEntriesCache;
+diff --git a/owners/src/main/java/com/googlesource/gerrit/owners/OwnersModule.java b/owners/src/main/java/com/googlesource/gerrit/owners/OwnersModule.java
+index 81aef29..7d2c4d5 100644
+--- a/owners/src/main/java/com/googlesource/gerrit/owners/OwnersModule.java
++++ b/owners/src/main/java/com/googlesource/gerrit/owners/OwnersModule.java
+@@ -17,7 +17,7 @@ package com.googlesource.gerrit.owners;
+
+ import com.google.common.flogger.FluentLogger;
+ import com.google.gerrit.extensions.registration.DynamicSet;
+-import com.google.gerrit.server.rules.prolog.PredicateProvider;
++import com.google.gerrit.server.rules.PredicateProvider;
+ import com.google.inject.AbstractModule;
+ import com.google.inject.Inject;
+ import com.googlesource.gerrit.owners.common.PathOwnersEntriesCache;
+diff --git a/owners/src/main/java/com/googlesource/gerrit/owners/OwnersStoredValues.java b/owners/src/main/java/com/googlesource/gerrit/owners/OwnersStoredValues.java
+index 9d5b3d9..c4d27e4 100644
+--- a/owners/src/main/java/com/googlesource/gerrit/owners/OwnersStoredValues.java
++++ b/owners/src/main/java/com/googlesource/gerrit/owners/OwnersStoredValues.java
+@@ -21,8 +21,8 @@ import com.google.gerrit.metrics.Timer0;
+ import com.google.gerrit.server.git.GitRepositoryManager;
+ import com.google.gerrit.server.patch.filediff.FileDiffOutput;
+ import com.google.gerrit.server.project.ProjectState;
+-import com.google.gerrit.server.rules.prolog.StoredValue;
+-import com.google.gerrit.server.rules.prolog.StoredValues;
++import com.google.gerrit.server.rules.StoredValue;
++import com.google.gerrit.server.rules.StoredValues;
+ import com.googlecode.prolog_cafe.lang.Prolog;
+ import com.googlesource.gerrit.owners.common.Accounts;
+ import com.googlesource.gerrit.owners.common.PathOwners;
+diff --git a/owners/src/main/java/gerrit_owners/PRED_code_review_user_1.java b/owners/src/main/java/gerrit_owners/PRED_code_review_user_1.java
+index 92df174..a2dd06b 100644
+--- a/owners/src/main/java/gerrit_owners/PRED_code_review_user_1.java
++++ b/owners/src/main/java/gerrit_owners/PRED_code_review_user_1.java
+@@ -20,7 +20,7 @@ import com.google.gerrit.entities.LabelId;
+ import com.google.gerrit.entities.LabelType;
+ import com.google.gerrit.entities.LabelValue;
+ import com.google.gerrit.server.query.change.ChangeData;
+-import com.google.gerrit.server.rules.prolog.StoredValues;
++import com.google.gerrit.server.rules.StoredValues;
+ import com.googlecode.prolog_cafe.exceptions.PrologException;
+ import com.googlecode.prolog_cafe.lang.IntegerTerm;
+ import com.googlecode.prolog_cafe.lang.JavaObjectTerm;
+diff --git a/owners/src/main/java/gerrit_owners/PRED_file_owners_2.java b/owners/src/main/java/gerrit_owners/PRED_file_owners_2.java
+index 11f1a74..cbb23cf 100644
+--- a/owners/src/main/java/gerrit_owners/PRED_file_owners_2.java
++++ b/owners/src/main/java/gerrit_owners/PRED_file_owners_2.java
+@@ -18,8 +18,8 @@ import static com.googlesource.gerrit.owners.common.StreamUtils.iteratorStream;
+
+ import com.google.gerrit.entities.Account;
+ import com.google.gerrit.server.IdentifiedUser;
+-import com.google.gerrit.server.rules.prolog.PrologEnvironment;
+-import com.google.gerrit.server.rules.prolog.StoredValues;
++import com.google.gerrit.server.rules.PrologEnvironment;
++import com.google.gerrit.server.rules.StoredValues;
+ import com.googlecode.prolog_cafe.exceptions.PInstantiationException;
+ import com.googlecode.prolog_cafe.exceptions.PrologException;
+ import com.googlecode.prolog_cafe.lang.Operation;