opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.10' into stable-2.11

Browse Source 
* stable-2.10:
  Bump JGit to v4.0.0.201506090130-r

Change-Id: Ibed498b3a7d0a9acd9eb331d4354e999165928a5
This commit is contained in:
David Pursehouse 2015-06-10 21:28:38 +09:00
commit 1a26fb3c3e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java
View File

@ -667,7 +667,7 @@ public class MergeUtil {
}
@Override
public void release() {
public void close() {
}
});
return (ThreeWayMerger) m;

2
gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java
View File

@ -337,7 +337,7 @@ public class PatchListLoader extends CacheLoader<PatchListKey, PatchList> {
}
@Override
public void release() {
public void close() {
}
});

12
lib/jgit/BUCK
View File

@ -1,13 +1,13 @@
include_defs('//lib/maven.defs')
REPO = MAVEN_CENTRAL # Leave here even if set to MAVEN_CENTRAL.
VERS = '4.0.0.201505050340-m2'
VERS = '4.0.0.201506090130-r'
maven_jar(
name = 'jgit',
id = 'org.eclipse.jgit:org.eclipse.jgit:' + VERS,
bin_sha1 = '1cc3120d39ed2b55584e631634e65c5d2e6c1cf7',
src_sha1 = '425f578cc9d5ccb8f3b050a5ab1e2d7a0becb25d',
bin_sha1 = '859b5dbae0372bc0744503b9593119410c0474f2',
src_sha1 = '5a7b7e179852c20f6af8581b96cf6441b23025a5',
license = 'jgit',
repository = REPO,
unsign = True,
@ -22,7 +22,7 @@ maven_jar(
maven_jar(
name = 'jgit-servlet',
id = 'org.eclipse.jgit:org.eclipse.jgit.http.server:' + VERS,
sha1 = '2a9f55d1d92afef795542b995db6ab261007857f',
sha1 = 'd86da25c9e1042612ebe3be1e027cce4d9a8e4c9',
license = 'jgit',
repository = REPO,
deps = [':jgit'],
@ -36,7 +36,7 @@ maven_jar(
maven_jar(
name = 'jgit-archive',
id = 'org.eclipse.jgit:org.eclipse.jgit.archive:' + VERS,
sha1 = 'ee3954753067818f8f734981a01c13ac33425f2c',
sha1 = '3b1f5cefdd65bbe81851f638ee1f461c9cb5df20',
license = 'jgit',
repository = REPO,
deps = [':jgit',
@ -53,7 +53,7 @@ maven_jar(
maven_jar(
name = 'junit',
id = 'org.eclipse.jgit:org.eclipse.jgit.junit:' + VERS,
sha1 = '6cc19f8f0a1791e26d4225625ecba6a31d9b830e',
sha1 = 'e86c5b8ec06624d3cd2b8c11fd0c528281751329',
license = 'DO_NOT_DISTRIBUTE',
repository = REPO,
unsign = True,