Serge Bazanski | 2ceb69f | 2023-10-08 12:27:44 +0000 | [diff] [blame] | 1 | Synchronzies Jackson version with oauth plugin, bumps API to 3.7. |
| 2 | |
| 3 | diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl |
| 4 | index 5ad1930..712e0d3 100644 |
| 5 | --- a/external_plugin_deps.bzl |
| 6 | +++ b/external_plugin_deps.bzl |
| 7 | @@ -1,30 +1,30 @@ |
| 8 | load("//tools/bzl:maven_jar.bzl", "maven_jar") |
| 9 | |
| 10 | -JACKSON_VER = "2.9.7" |
| 11 | +JACKSON_VER = "2.10.2" |
| 12 | |
| 13 | def external_plugin_deps(): |
| 14 | maven_jar( |
| 15 | name = "jackson-core", |
| 16 | artifact = "com.fasterxml.jackson.core:jackson-core:" + JACKSON_VER, |
| 17 | - sha1 = "4b7f0e0dc527fab032e9800ed231080fdc3ac015", |
| 18 | + sha1 = "73d4322a6bda684f676a2b5fe918361c4e5c7cca", |
| 19 | ) |
| 20 | |
| 21 | maven_jar( |
| 22 | name = "jackson-databind", |
| 23 | artifact = "com.fasterxml.jackson.core:jackson-databind:" + JACKSON_VER, |
| 24 | - sha1 = "e6faad47abd3179666e89068485a1b88a195ceb7", |
| 25 | + sha1 = "0528de95f198afafbcfb0c09d2e43b6e0ea663ec", |
| 26 | ) |
| 27 | |
| 28 | maven_jar( |
| 29 | name = "jackson-annotations", |
| 30 | artifact = "com.fasterxml.jackson.core:jackson-annotations:" + JACKSON_VER, |
| 31 | - sha1 = "4b838e5c4fc17ac02f3293e9a558bb781a51c46d", |
| 32 | + sha1 = "3a13b6105946541b8d4181a0506355b5fae63260", |
| 33 | ) |
| 34 | |
| 35 | maven_jar( |
| 36 | name = "jackson-dataformat-yaml", |
| 37 | artifact = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:" + JACKSON_VER, |
| 38 | - sha1 = "a428edc4bb34a2da98a50eb759c26941d4e85960", |
| 39 | + sha1 = "8a6a6ad573b48dc3b623414719428ecbfeb259a3", |
| 40 | ) |
| 41 | |
| 42 | maven_jar( |
| 43 | diff --git a/external_plugin_deps_standalone.bzl b/external_plugin_deps_standalone.bzl |
| 44 | index b2964a5..9f56994 100644 |
| 45 | --- a/external_plugin_deps_standalone.bzl |
| 46 | +++ b/external_plugin_deps_standalone.bzl |
| 47 | @@ -5,7 +5,7 @@ PROLOG_VERS = "1.4.3" |
| 48 | PROLOG_REPO = GERRIT |
| 49 | |
| 50 | def external_plugin_deps_standalone(): |
| 51 | - external_plugin_deps(omit_jackson_core = False) |
| 52 | + external_plugin_deps() |
| 53 | |
| 54 | maven_jar( |
| 55 | name = "prolog-runtime", |
| 56 | diff --git a/owners/src/main/java/com/googlesource/gerrit/owners/OwnerPredicateProvider.java b/owners/src/main/java/com/googlesource/gerrit/owners/OwnerPredicateProvider.java |
| 57 | index b83d7a8..d15da8e 100644 |
| 58 | --- a/owners/src/main/java/com/googlesource/gerrit/owners/OwnerPredicateProvider.java |
| 59 | +++ b/owners/src/main/java/com/googlesource/gerrit/owners/OwnerPredicateProvider.java |
| 60 | @@ -18,7 +18,7 @@ package com.googlesource.gerrit.owners; |
| 61 | |
| 62 | import com.google.common.collect.ImmutableSet; |
| 63 | import com.google.gerrit.extensions.annotations.Listen; |
| 64 | -import com.google.gerrit.server.rules.prolog.PredicateProvider; |
| 65 | +import com.google.gerrit.server.rules.PredicateProvider; |
| 66 | import com.google.inject.Inject; |
| 67 | import com.googlesource.gerrit.owners.common.Accounts; |
| 68 | import com.googlesource.gerrit.owners.common.PathOwnersEntriesCache; |
| 69 | diff --git a/owners/src/main/java/com/googlesource/gerrit/owners/OwnersModule.java b/owners/src/main/java/com/googlesource/gerrit/owners/OwnersModule.java |
| 70 | index 81aef29..7d2c4d5 100644 |
| 71 | --- a/owners/src/main/java/com/googlesource/gerrit/owners/OwnersModule.java |
| 72 | +++ b/owners/src/main/java/com/googlesource/gerrit/owners/OwnersModule.java |
| 73 | @@ -17,7 +17,7 @@ package com.googlesource.gerrit.owners; |
| 74 | |
| 75 | import com.google.common.flogger.FluentLogger; |
| 76 | import com.google.gerrit.extensions.registration.DynamicSet; |
| 77 | -import com.google.gerrit.server.rules.prolog.PredicateProvider; |
| 78 | +import com.google.gerrit.server.rules.PredicateProvider; |
| 79 | import com.google.inject.AbstractModule; |
| 80 | import com.google.inject.Inject; |
| 81 | import com.googlesource.gerrit.owners.common.PathOwnersEntriesCache; |
| 82 | diff --git a/owners/src/main/java/com/googlesource/gerrit/owners/OwnersStoredValues.java b/owners/src/main/java/com/googlesource/gerrit/owners/OwnersStoredValues.java |
| 83 | index 9d5b3d9..c4d27e4 100644 |
| 84 | --- a/owners/src/main/java/com/googlesource/gerrit/owners/OwnersStoredValues.java |
| 85 | +++ b/owners/src/main/java/com/googlesource/gerrit/owners/OwnersStoredValues.java |
| 86 | @@ -21,8 +21,8 @@ import com.google.gerrit.metrics.Timer0; |
| 87 | import com.google.gerrit.server.git.GitRepositoryManager; |
| 88 | import com.google.gerrit.server.patch.filediff.FileDiffOutput; |
| 89 | import com.google.gerrit.server.project.ProjectState; |
| 90 | -import com.google.gerrit.server.rules.prolog.StoredValue; |
| 91 | -import com.google.gerrit.server.rules.prolog.StoredValues; |
| 92 | +import com.google.gerrit.server.rules.StoredValue; |
| 93 | +import com.google.gerrit.server.rules.StoredValues; |
| 94 | import com.googlecode.prolog_cafe.lang.Prolog; |
| 95 | import com.googlesource.gerrit.owners.common.Accounts; |
| 96 | import com.googlesource.gerrit.owners.common.PathOwners; |
| 97 | 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 |
| 98 | index 92df174..a2dd06b 100644 |
| 99 | --- a/owners/src/main/java/gerrit_owners/PRED_code_review_user_1.java |
| 100 | +++ b/owners/src/main/java/gerrit_owners/PRED_code_review_user_1.java |
| 101 | @@ -20,7 +20,7 @@ import com.google.gerrit.entities.LabelId; |
| 102 | import com.google.gerrit.entities.LabelType; |
| 103 | import com.google.gerrit.entities.LabelValue; |
| 104 | import com.google.gerrit.server.query.change.ChangeData; |
| 105 | -import com.google.gerrit.server.rules.prolog.StoredValues; |
| 106 | +import com.google.gerrit.server.rules.StoredValues; |
| 107 | import com.googlecode.prolog_cafe.exceptions.PrologException; |
| 108 | import com.googlecode.prolog_cafe.lang.IntegerTerm; |
| 109 | import com.googlecode.prolog_cafe.lang.JavaObjectTerm; |
| 110 | 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 |
| 111 | index 11f1a74..cbb23cf 100644 |
| 112 | --- a/owners/src/main/java/gerrit_owners/PRED_file_owners_2.java |
| 113 | +++ b/owners/src/main/java/gerrit_owners/PRED_file_owners_2.java |
| 114 | @@ -18,8 +18,8 @@ import static com.googlesource.gerrit.owners.common.StreamUtils.iteratorStream; |
| 115 | |
| 116 | import com.google.gerrit.entities.Account; |
| 117 | import com.google.gerrit.server.IdentifiedUser; |
| 118 | -import com.google.gerrit.server.rules.prolog.PrologEnvironment; |
| 119 | -import com.google.gerrit.server.rules.prolog.StoredValues; |
| 120 | +import com.google.gerrit.server.rules.PrologEnvironment; |
| 121 | +import com.google.gerrit.server.rules.StoredValues; |
| 122 | import com.googlecode.prolog_cafe.exceptions.PInstantiationException; |
| 123 | import com.googlecode.prolog_cafe.exceptions.PrologException; |
| 124 | import com.googlecode.prolog_cafe.lang.Operation; |