opendev/gerrit
Code Issues Proposed changes

Merge changes from topic "jgit-5.1.1"

Browse Source 
* changes:
  ProjectResetter: Replace trivial usage of deprecated Repository.getAllRefs
  PatchListEntry: Don't use deprecated Constants.CHARSET from JGit
  Upgrade JGit to 5.1.1.201809181055-r


* submodules:
* Update plugins/reviewnotes from branch 'master'
  to 54525ffaed5e8925d97657a622532a00a0006347
  - CreateReviewNotes: Don't use deprecated Repository.getAllRefs
    
    Change-Id: I867c5003185c9b41c5182b8d05e9db2d9dae2cfa
This commit is contained in:
David Ostrovsky 2018-09-19 18:07:13 +00:00 committed by Gerrit Code Review
commit edc9292feb
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/acceptance/ProjectResetter.java
View File

@ -214,7 +214,7 @@ public class ProjectResetter implements AutoCloseable {
for (Map.Entry<Project.NameKey, Collection<String>> e :
refsPatternByProject.asMap().entrySet()) {
try (Repository repo = repoManager.openRepository(e.getKey())) {
Collection<Ref> refs = repo.getAllRefs().values();
Collection<Ref> refs = repo.getRefDatabase().getRefs();
for (String refPattern : e.getValue()) {
RefPatternMatcher matcher = RefPatternMatcher.getMatcher(refPattern);
for (Ref ref : refs) {

4
java/com/google/gerrit/server/patch/PatchListEntry.java
View File

@ -26,6 +26,7 @@ import static com.google.gerrit.server.ioutil.BasicSerialization.writeEnum;
import static com.google.gerrit.server.ioutil.BasicSerialization.writeFixInt64;
import static com.google.gerrit.server.ioutil.BasicSerialization.writeString;
import static com.google.gerrit.server.ioutil.BasicSerialization.writeVarInt32;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@ -41,7 +42,6 @@ import java.util.Collection;
import java.util.List;
import java.util.Set;
import org.eclipse.jgit.diff.Edit;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.patch.CombinedFileHeader;
import org.eclipse.jgit.patch.FileHeader;
import org.eclipse.jgit.util.IntList;
@ -223,7 +223,7 @@ public class PatchListEntry {
if (header[e - 1] == '\n') {
e--;
}
headerLines.add(RawParseUtils.decode(Constants.CHARSET, header, b, e));
headerLines.add(RawParseUtils.decode(UTF_8, header, b, e));
}
return headerLines;
}

12
lib/jgit/jgit.bzl
View File

@ -1,6 +1,6 @@
load("//tools/bzl:maven_jar.bzl", "GERRIT", "MAVEN_CENTRAL", "MAVEN_LOCAL", "maven_jar")
_JGIT_VERS = "5.0.3.201809091024-r"
_JGIT_VERS = "5.1.1.201809181055-r"
_DOC_VERS = _JGIT_VERS # Set to _JGIT_VERS unless using a snapshot
@ -40,28 +40,28 @@ def jgit_maven_repos():
name = "jgit-lib",
artifact = "org.eclipse.jgit:org.eclipse.jgit:" + _JGIT_VERS,
repository = _JGIT_REPO,
sha1 = "0afec2df3ff8835bc4d5c279d14fad0daae6dd93",
src_sha1 = "e2c978064e2a46b260bbda0d8c393ed741046420",
sha1 = "64dfe41b3c152bb9b7158b214e28467cb1217153",
src_sha1 = "ff6ab018897cf4213b905e156ac5930bad2bdff1",
unsign = True,
)
maven_jar(
name = "jgit-servlet",
artifact = "org.eclipse.jgit:org.eclipse.jgit.http.server:" + _JGIT_VERS,
repository = _JGIT_REPO,
sha1 = "8fb0f9b6c38ac6fce60f2ead740e03dd79c3c288",
sha1 = "22fd6827fbb6135efd813271185a91f8615538eb",
unsign = True,
)
maven_jar(
name = "jgit-archive",
artifact = "org.eclipse.jgit:org.eclipse.jgit.archive:" + _JGIT_VERS,
repository = _JGIT_REPO,
sha1 = "72a157ce261f3eb938d9e0ee83d7c9700aa7d736",
sha1 = "bfbbdd6aa1893db14f346913aad3f9898b2fe01d",
)
maven_jar(
name = "jgit-junit",
artifact = "org.eclipse.jgit:org.eclipse.jgit.junit:" + _JGIT_VERS,
repository = _JGIT_REPO,
sha1 = "eb430358d96dedd923e4075cd54a7db4cab51ca2",
sha1 = "6de6de74053d7c28100fe128255d7382a939fe99",
unsign = True,
)

2
plugins/reviewnotes

@ -1 +1 @@
Subproject commit 920f28b46021d9c49fac09d869aa4040d13796e7
Subproject commit 54525ffaed5e8925d97657a622532a00a0006347