opendev/gerrit
Code Issues Proposed changes

Update JGit to 4.8.0.201706111038-r

Browse Source 
Test fix was cherry-picked from fe494ed59e
which was submitted on stable-2.14 when JGit was updated to
4.7.1.201706071930-r.

Change-Id: I16395936628d6f04668cc0adf9bd3eb6c7080394
This commit is contained in:
Matthias Sohn 2017-06-16 13:31:33 +02:00
parent 74c22a6ed1
commit 5a415585ec
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/UploadArchiveIT.java
View File

@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.TruthJUnit.assume;
import com.google.common.base.Splitter;
import com.google.common.collect.Iterables;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.GerritConfig;
import com.google.gerrit.acceptance.NoHttpd;
@ -93,9 +92,11 @@ public class UploadArchiveIT extends AbstractDaemonTest {
}
}
assertThat(entryNames.size()).isEqualTo(1);
assertThat(Iterables.getOnlyElement(entryNames))
.isEqualTo(String.format("%s/%s", abbreviated, PushOneCommit.FILE_NAME));
assertThat(entryNames)
.containsExactly(
String.format("%s/", abbreviated),
String.format("%s/%s", abbreviated, PushOneCommit.FILE_NAME))
.inOrder();
}
private String command(PushOneCommit.Result r, String abbreviated) {

12
lib/jgit/jgit.bzl
View File

@ -1,6 +1,6 @@
load("//tools/bzl:maven_jar.bzl", "GERRIT", "MAVEN_LOCAL", "MAVEN_CENTRAL", "maven_jar")
_JGIT_VERS = "4.8.0.201705170830-rc1"
_JGIT_VERS = "4.8.0.201706111038-r"
_DOC_VERS = _JGIT_VERS # Set to _JGIT_VERS unless using a snapshot
@ -26,28 +26,28 @@ def jgit_maven_repos():
name = "jgit_lib",
artifact = "org.eclipse.jgit:org.eclipse.jgit:" + _JGIT_VERS,
repository = _JGIT_REPO,
sha1 = "f1a2099e87cb57525233a5e882b4e35b5a2803dc",
src_sha1 = "1646655e3ed54c01dfa31881dd6e7fea5ec74dd2",
sha1 = "f0978a9e868accf9a405d9387bec091a99d87633",
src_sha1 = "93cefbf1d73f1179b40419a3898c53a64e52aa93",
unsign = True,
)
maven_jar(
name = "jgit_servlet",
artifact = "org.eclipse.jgit:org.eclipse.jgit.http.server:" + _JGIT_VERS,
repository = _JGIT_REPO,
sha1 = "4613ff060415639f53fbed0f703f1e81688a9ac5",
sha1 = "3c099afdc063bad438a3b87eea643e9722a07de8",
unsign = True,
)
maven_jar(
name = "jgit_archive",
artifact = "org.eclipse.jgit:org.eclipse.jgit.archive:" + _JGIT_VERS,
repository = _JGIT_REPO,
sha1 = "8fd983244622c9085f74cec4361761119c7093fe",
sha1 = "1350a5cf1fad91dd33b66f9fb804dc8e68270890",
)
maven_jar(
name = "jgit_junit",
artifact = "org.eclipse.jgit:org.eclipse.jgit.junit:" + _JGIT_VERS,
repository = _JGIT_REPO,
sha1 = "d50f32f886cd4dfe2590dec9631578660c672df5",
sha1 = "4f45f8f6714df649dbad8c1b1baf68b9510b5047",
unsign = True,
)