Merge branch 'stable-2.12' into stable-2.13
* stable-2.12:
Upgrade JGit to v4.5.4.201711221230-r
Fix deprecation warnings from latest JGit update
Upgrade JGit to 4.3.0.201604071810-r
Set version to 2.12.9-SNAPSHOT
Change-Id: I47b4c3065eb41b96bdd8d6f5f34b4553314650d5
diff --git a/lib/JGIT_VERSION b/lib/JGIT_VERSION
index abd06f3..1ef558b 100644
--- a/lib/JGIT_VERSION
+++ b/lib/JGIT_VERSION
@@ -1,6 +1,6 @@
include_defs('//lib/maven.defs')
REPO = MAVEN_CENTRAL # Leave here even if set to MAVEN_CENTRAL.
-VERS = '4.5.2.201704071617-r'
+VERS = '4.5.4.201711221230-r'
DOC_VERS = VERS # Set to VERS unless using a snapshot
JGIT_DOC_URL="http://download.eclipse.org/jgit/site/" + DOC_VERS + "/apidocs"
diff --git a/lib/jgit/org.eclipse.jgit.archive/BUCK b/lib/jgit/org.eclipse.jgit.archive/BUCK
index ab95e2a..3accb33 100644
--- a/lib/jgit/org.eclipse.jgit.archive/BUCK
+++ b/lib/jgit/org.eclipse.jgit.archive/BUCK
@@ -4,7 +4,7 @@
maven_jar(
name = 'jgit-archive',
id = 'org.eclipse.jgit:org.eclipse.jgit.archive:' + VERS,
- sha1 = 'd70270a355e8582c21a74c34fae0dfec4b641632',
+ sha1 = '6b0b919ee42bf8276193c3c03581634bc3aa7e18',
license = 'jgit',
repository = REPO,
deps = ['//lib/jgit/org.eclipse.jgit:jgit'],
diff --git a/lib/jgit/org.eclipse.jgit.http.server/BUCK b/lib/jgit/org.eclipse.jgit.http.server/BUCK
index c157bec..7c7287c 100644
--- a/lib/jgit/org.eclipse.jgit.http.server/BUCK
+++ b/lib/jgit/org.eclipse.jgit.http.server/BUCK
@@ -4,7 +4,7 @@
maven_jar(
name = 'jgit-servlet',
id = 'org.eclipse.jgit:org.eclipse.jgit.http.server:' + VERS,
- sha1 = '04cf57795ffd2a577a20746f9c6a0b0922438dd9',
+ sha1 = '264fac29b6007146127156113ed3d4e0aa922b39',
license = 'jgit',
repository = REPO,
deps = ['//lib/jgit/org.eclipse.jgit:jgit'],
diff --git a/lib/jgit/org.eclipse.jgit.junit/BUCK b/lib/jgit/org.eclipse.jgit.junit/BUCK
index 043fe62..3c6ee80 100644
--- a/lib/jgit/org.eclipse.jgit.junit/BUCK
+++ b/lib/jgit/org.eclipse.jgit.junit/BUCK
@@ -4,7 +4,7 @@
maven_jar(
name = 'junit',
id = 'org.eclipse.jgit:org.eclipse.jgit.junit:' + VERS,
- sha1 = '5eaebfd74c106ac5cbee9e4303f19165812f23c6',
+ sha1 = '58ca0a0fba72f2db6e6b27bd464dc44a946a617c',
license = 'DO_NOT_DISTRIBUTE',
repository = REPO,
unsign = True,
diff --git a/lib/jgit/org.eclipse.jgit/BUCK b/lib/jgit/org.eclipse.jgit/BUCK
index a0c3fae..281fb6b 100644
--- a/lib/jgit/org.eclipse.jgit/BUCK
+++ b/lib/jgit/org.eclipse.jgit/BUCK
@@ -4,8 +4,8 @@
maven_jar(
name = 'jgit',
id = 'org.eclipse.jgit:org.eclipse.jgit:' + VERS,
- bin_sha1 = '01352ebdefb10aab661b97413f651bd6ca3766ce',
- src_sha1 = 'ad713d18ed0fa71279b002e2c1340a35dfbefee7',
+ bin_sha1 = 'b30f322c7d441260f4fa454ce5de65cf7e961274',
+ src_sha1 = '459f648f8bbf10e1aa0b122d4f9919e1779922e9',
license = 'jgit',
repository = REPO,
unsign = True,