opendev/gerrit
Code Issues Proposed changes

Update JGit to recent snapshot

Browse Source 
Fix a resulting compile error due to exceptions changing.

Change-Id: I3119eb73e07b5ee489af907c3c6202b900ab5c09
This commit is contained in:
Dave Borowitz
2016-01-21 11:39:26 -05:00
parent 3da50441d9
commit 324fd5f3af
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
View File

@@ -168,17 +168,12 @@ public class ChangeInserter extends BatchUpdate.InsertChangeOp {
if (!idList.isEmpty()) { if (!idList.isEmpty()) {
return new Change.Key(idList.get(idList.size() - 1).trim()); return new Change.Key(idList.get(idList.size() - 1).trim());
} }
ObjectId id = ChangeIdUtil.computeChangeId(commit.getTree(), commit,
try { commit.getAuthorIdent(), commit.getCommitterIdent(),
ObjectId id = ChangeIdUtil.computeChangeId(commit.getTree(), commit, commit.getShortMessage());
commit.getAuthorIdent(), commit.getCommitterIdent(), StringBuilder changeId = new StringBuilder();
commit.getShortMessage()); changeId.append("I").append(ObjectId.toString(id));
StringBuilder changeId = new StringBuilder(); return new Change.Key(changeId.toString());
changeId.append("I").append(ObjectId.toString(id));
return new Change.Key(changeId.toString());
} catch (IOException e) {
throw new IllegalStateException(e);
}
} }
public PatchSet.Id getPatchSetId() { public PatchSet.Id getPatchSetId() {

12
lib/jgit/BUCK
View File

@@ -1,13 +1,13 @@
include_defs('//lib/maven.defs') include_defs('//lib/maven.defs')
REPO = GERRIT # Leave here even if set to MAVEN_CENTRAL. REPO = GERRIT # Leave here even if set to MAVEN_CENTRAL.
VERS = '4.2.0.201511101648-m1.136-g91a3f17' VERS = '4.2.0.201511101648-m1.201-g7b61229'
maven_jar( maven_jar(
name = 'jgit', name = 'jgit',
id = 'org.eclipse.jgit:org.eclipse.jgit:' + VERS, id = 'org.eclipse.jgit:org.eclipse.jgit:' + VERS,
bin_sha1 = '6820c375589d520600210a5e6fa9c427c98da9f9', bin_sha1 = '2ee3b2c4b766b49ef14dfe03a5b2256a7b9d1023',
src_sha1 = '84566ffe5dd8a099ef55eca29d073e64a290f464', src_sha1 = '4042ba30571234e484f0d2e5b305b70601cebdee',
license = 'jgit', license = 'jgit',
repository = REPO, repository = REPO,
unsign = True, unsign = True,
@@ -22,7 +22,7 @@ maven_jar(
maven_jar( maven_jar(
name = 'jgit-servlet', name = 'jgit-servlet',
id = 'org.eclipse.jgit:org.eclipse.jgit.http.server:' + VERS, id = 'org.eclipse.jgit:org.eclipse.jgit.http.server:' + VERS,
sha1 = 'e156f06051cf431e72239e84cb85f554d90a7ef0', sha1 = '4e213feb3f2f754b9956cd8ceadf307a146a765c',
license = 'jgit', license = 'jgit',
repository = REPO, repository = REPO,
deps = [':jgit'], deps = [':jgit'],
@@ -36,7 +36,7 @@ maven_jar(
maven_jar( maven_jar(
name = 'jgit-archive', name = 'jgit-archive',
id = 'org.eclipse.jgit:org.eclipse.jgit.archive:' + VERS, id = 'org.eclipse.jgit:org.eclipse.jgit.archive:' + VERS,
sha1 = '7bbb559e7f90fa7aeb4ff6867c428d1456861e50', sha1 = '5c40a2656fd883ec0ecbc19d937dff8da0ac85e1',
license = 'jgit', license = 'jgit',
repository = REPO, repository = REPO,
deps = [':jgit', deps = [':jgit',
@@ -53,7 +53,7 @@ maven_jar(
maven_jar( maven_jar(
name = 'junit', name = 'junit',
id = 'org.eclipse.jgit:org.eclipse.jgit.junit:' + VERS, id = 'org.eclipse.jgit:org.eclipse.jgit.junit:' + VERS,
sha1 = 'a88ce61fd778ea8b17ae2235ae594ddc59f9bf39', sha1 = '0a51b18ccdc2690b68fa0eb91d23fef0f26b9e57',
license = 'DO_NOT_DISTRIBUTE', license = 'DO_NOT_DISTRIBUTE',
repository = REPO, repository = REPO,
unsign = True, unsign = True,