From 906c172dba8f2003fee2780d2f87f561d4be7263 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Tue, 14 May 2019 11:14:32 +0200 Subject: [PATCH] Upgrade JGit to 5.3.1.201904271842-r As discussed during the Hackathon, we need to get Gerrit and JGit on the same workstream and there are no reasons why we should not use the latest stable JGit for the new version of Gerrit v3.0. Change-Id: I2c199b07ae68831bc7de57f9ace030d83fe20afe --- lib/jgit/jgit.bzl | 12 ++++++------ plugins/gitiles | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/jgit/jgit.bzl b/lib/jgit/jgit.bzl index 6828807975..b5c4dcc3cf 100644 --- a/lib/jgit/jgit.bzl +++ b/lib/jgit/jgit.bzl @@ -1,6 +1,6 @@ load("//tools/bzl:maven_jar.bzl", "MAVEN_CENTRAL", "maven_jar") -_JGIT_VERS = "5.2.1.201812262042-r" +_JGIT_VERS = "5.3.1.201904271842-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 = "34914e63e1463e40ba40e2e28b0392993ea3b938", - src_sha1 = "b1c9e2ae01dd31ab4957de54756ec11acc99bb30", + sha1 = "dba85014483315fa426259bc1b8ccda9373a624b", + src_sha1 = "b2ddc76c39d81df716948a00d26faa35e11a0ddf", unsign = True, ) maven_jar( name = "jgit-servlet", artifact = "org.eclipse.jgit:org.eclipse.jgit.http.server:" + _JGIT_VERS, repository = _JGIT_REPO, - sha1 = "18c8938c4d8966abed84fc9de6c09aaea8cc8d87", + sha1 = "3287341fca859340a00b51cb5dd3b78b8e532b39", unsign = True, ) maven_jar( name = "jgit-archive", artifact = "org.eclipse.jgit:org.eclipse.jgit.archive:" + _JGIT_VERS, repository = _JGIT_REPO, - sha1 = "08c945bc664e4efe0d0e9a878f96505076da2ca9", + sha1 = "3585027e83fb44a5de2c10ae9ddbf976593bf080", ) maven_jar( name = "jgit-junit", artifact = "org.eclipse.jgit:org.eclipse.jgit.junit:" + _JGIT_VERS, repository = _JGIT_REPO, - sha1 = "5a5fb36517cb05ca51cbb1f00a520142dc83f793", + sha1 = "3d9ba7e610d6ab5d08dcb1e4ba448b592a34de77", unsign = True, ) diff --git a/plugins/gitiles b/plugins/gitiles index cd9cdddfb0..a58ae0ba2c 160000 --- a/plugins/gitiles +++ b/plugins/gitiles @@ -1 +1 @@ -Subproject commit cd9cdddfb0747065b532817f8eca27bb5ed04478 +Subproject commit a58ae0ba2c23576a68d457e00aaf0902f41e4bb9