opendev/gerrit
Code Issues Proposed changes

Update JGit to 4.7.1.201706071930-r

Browse Source 
Adapt UploadArchiveIT to account for the extra directory entry added
in the archive by ArchiveCommand since [1].

[1] https://git.eclipse.org/r/#/c/98478/

Change-Id: I12bff3bbea7493085fbe7d9bac428c90b07926be
This commit is contained in:
Matthias Sohn 2017-06-08 09:41:21 +02:00 committed by David Pursehouse
parent a85e8147b3
commit fe494ed59e
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 static com.google.common.truth.TruthJUnit.assume;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import com.google.common.collect.Iterables;
import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.GerritConfig; import com.google.gerrit.acceptance.GerritConfig;
import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.NoHttpd;
@ -93,9 +92,11 @@ public class UploadArchiveIT extends AbstractDaemonTest {
} }
} }
assertThat(entryNames.size()).isEqualTo(1); assertThat(entryNames)
assertThat(Iterables.getOnlyElement(entryNames)) .containsExactly(
.isEqualTo(String.format("%s/%s", abbreviated, PushOneCommit.FILE_NAME)); String.format("%s/", abbreviated),
String.format("%s/%s", abbreviated, PushOneCommit.FILE_NAME))
.inOrder();
} }
private String command(PushOneCommit.Result r, String abbreviated) { 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") load("//tools/bzl:maven_jar.bzl", "GERRIT", "MAVEN_LOCAL", "MAVEN_CENTRAL", "maven_jar")
_JGIT_VERS = "4.7.0.201704051617-r" _JGIT_VERS = "4.7.1.201706071930-r"
_DOC_VERS = _JGIT_VERS # Set to _JGIT_VERS unless using a snapshot _DOC_VERS = _JGIT_VERS # Set to _JGIT_VERS unless using a snapshot
@ -26,28 +26,28 @@ def jgit_maven_repos():
name = "jgit_lib", name = "jgit_lib",
artifact = "org.eclipse.jgit:org.eclipse.jgit:" + _JGIT_VERS, artifact = "org.eclipse.jgit:org.eclipse.jgit:" + _JGIT_VERS,
repository = _JGIT_REPO, repository = _JGIT_REPO,
sha1 = "99be65d1827276b97d4f51668b60f4a38f282bda", sha1 = "0023aa574d6ea984e770af60da94da366a0109d2",
src_sha1 = "de519d6f352aaf12e4c65f7590591326ac24d2e8", src_sha1 = "0497d0ac4f7c44eea49a32e7e1d6a5eee6343c33",
unsign = True, unsign = True,
) )
maven_jar( maven_jar(
name = "jgit_servlet", name = "jgit_servlet",
artifact = "org.eclipse.jgit:org.eclipse.jgit.http.server:" + _JGIT_VERS, artifact = "org.eclipse.jgit:org.eclipse.jgit.http.server:" + _JGIT_VERS,
repository = _JGIT_REPO, repository = _JGIT_REPO,
sha1 = "72fa98ebf001aadd3dcb99ca8f7fcd90983da56b", sha1 = "0bacf02e5c9c587f8a6e680278d2b4b7fc8df96d",
unsign = True, unsign = True,
) )
maven_jar( maven_jar(
name = "jgit_archive", name = "jgit_archive",
artifact = "org.eclipse.jgit:org.eclipse.jgit.archive:" + _JGIT_VERS, artifact = "org.eclipse.jgit:org.eclipse.jgit.archive:" + _JGIT_VERS,
repository = _JGIT_REPO, repository = _JGIT_REPO,
sha1 = "f825504a903dfe8d3daa61d6ab5c26fbad92c954", sha1 = "83c22720f1b00b4b5e321b9c8b089b91c1d78893",
) )
maven_jar( maven_jar(
name = "jgit_junit", name = "jgit_junit",
artifact = "org.eclipse.jgit:org.eclipse.jgit.junit:" + _JGIT_VERS, artifact = "org.eclipse.jgit:org.eclipse.jgit.junit:" + _JGIT_VERS,
repository = _JGIT_REPO, repository = _JGIT_REPO,
sha1 = "e0dbc6d3568b2ba65c9421af2f06e4158a624bcb", sha1 = "5a3f2d6cf33e88f3436acfd22a129bc7e2d2655b",
unsign = True, unsign = True,
) )