diff options
| author | Nasser Grainawi <nasser.grainawi@linaro.org> | 2024-04-03 18:48:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-03 18:48:06 +0000 |
| commit | e459de072a2e4c59077b9a68e78ad68e4d60565b (patch) | |
| tree | 02506109ecaa0b65607f3e1cf97fb14f8df57e9e | |
| parent | 3f071d6f42c1b1bd0f391b5f8542f981d76e15eb (diff) | |
| parent | c12196bc3cca36f70838d88e5d3b1285b585053f (diff) | |
Merge "Bump JGit to c0b415fb0" into stable-3.7
| -rw-r--r-- | .bazelversion | 2 | ||||
| -rw-r--r-- | java/com/google/gerrit/lucene/LuceneChangeIndex.java | 2 | ||||
| m--------- | modules/jgit | 0 | ||||
| -rw-r--r-- | tools/deps.bzl | 8 |
4 files changed, 6 insertions, 6 deletions
diff --git a/.bazelversion b/.bazelversion index 6abaeb2f90..91e4a9f262 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -6.2.0 +6.3.2 diff --git a/java/com/google/gerrit/lucene/LuceneChangeIndex.java b/java/com/google/gerrit/lucene/LuceneChangeIndex.java index a47b87e9b4..b568568f6e 100644 --- a/java/com/google/gerrit/lucene/LuceneChangeIndex.java +++ b/java/com/google/gerrit/lucene/LuceneChangeIndex.java @@ -558,7 +558,7 @@ public class LuceneChangeIndex implements ChangeIndex { } for (SchemaField<ChangeData, ?> field : getSchema().getSchemaFields().values()) { - if (fields.contains(field.getName()) && doc.get(field.getName()) != null) { + if (fields.contains(field.getName())) { field.setIfPossible(cd, new LuceneStoredValue(doc.get(field.getName()))); } } diff --git a/modules/jgit b/modules/jgit -Subproject acf21c0bc6a63a3d20fca92757b992a1f2d55f4 +Subproject c0b415fb028b4c1f29b6df749323bbb11599495 diff --git a/tools/deps.bzl b/tools/deps.bzl index 9a17ca803e..5ceae59d73 100644 --- a/tools/deps.bzl +++ b/tools/deps.bzl @@ -115,15 +115,15 @@ def java_dependencies(): maven_jar( name = "commons-codec", - artifact = "commons-codec:commons-codec:1.10", - sha1 = "4b95f4897fa13f2cd904aee711aeafc0c5295cd8", + artifact = "commons-codec:commons-codec:1.15", + sha1 = "49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d", ) # When upgrading commons-compress, also upgrade tukaani-xz maven_jar( name = "commons-compress", - artifact = "org.apache.commons:commons-compress:1.22", - sha1 = "691a8b4e6cf4248c3bc72c8b719337d5cb7359fa", + artifact = "org.apache.commons:commons-compress:1.25.0", + sha1 = "9d35aec423da6c8a7f93d7e9e1c6b1d9fe14bb5e", ) maven_jar( |