From e1d12494d98d87f8c827b7f46d67d6bc182f303f Mon Sep 17 00:00:00 2001
From: Matthias Sohn <matthias.sohn@sap.com>
Date: Tue, 27 Dec 2016 01:00:24 +0100
Subject: [PATCH] Update JGit to 4.6.0.201612231935-r

Change-Id: Ibd58603e6c1975c883dbf9f1d115e03a25467774
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Signed-off-by: David Pursehouse <dpursehouse@collab.net>
---
 WORKSPACE                                  | 14 +++++---------
 lib/JGIT_VERSION                           |  3 +--
 lib/jgit/jgit.bzl                          |  5 ++---
 lib/jgit/org.eclipse.jgit.archive/BUCK     |  2 +-
 lib/jgit/org.eclipse.jgit.http.server/BUCK |  2 +-
 lib/jgit/org.eclipse.jgit.junit/BUCK       |  2 +-
 lib/jgit/org.eclipse.jgit/BUCK             |  4 ++--
 7 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 0d0f414ddf..7b75437886 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -134,17 +134,15 @@ load("//lib/jgit:jgit.bzl", "JGIT_VERS")
 maven_jar(
     name = "jgit",
     artifact = "org.eclipse.jgit:org.eclipse.jgit:" + JGIT_VERS,
-    repository = GERRIT,
-    sha1 = "34315f71bb9becf6ff75947a9c43c415b929ec21",
-    src_sha1 = "8320c18472870904eb7fb860af353fea818d07e4",
+    sha1 = "b705df6cb4c0f4413e6ad52c6cd12011cc6fba4c",
+    src_sha1 = "6ec89bdedccdab092f395016ab761dcdb08f7ffc",
     unsign = True,
 )
 
 maven_jar(
     name = "jgit_servlet",
     artifact = "org.eclipse.jgit:org.eclipse.jgit.http.server:" + JGIT_VERS,
-    repository = GERRIT,
-    sha1 = "927990025d2970995dbb58f03763eeb776fec8fd",
+    sha1 = "5cb46863efcb208a3a9f729c0b6fd00be0dae6ee",
     unsign = True,
 )
 
@@ -158,15 +156,13 @@ maven_jar(
 maven_jar(
     name = "jgit_archive",
     artifact = "org.eclipse.jgit:org.eclipse.jgit.archive:" + JGIT_VERS,
-    repository = GERRIT,
-    sha1 = "4a5d058915400c1ef497bfeeb5e87d235213e273",
+    sha1 = "d44816c7b47746948485430e7372b15108b4bf2e",
 )
 
 maven_jar(
     name = "jgit_junit",
     artifact = "org.eclipse.jgit:org.eclipse.jgit.junit:" + JGIT_VERS,
-    repository = GERRIT,
-    sha1 = "8e3cb9b1f632fdfea76b04c286a2c0d8d260ebce",
+    sha1 = "42bd9796a68b0de8abf1e0c23ebd4006bf9645e0",
     unsign = True,
 )
 
diff --git a/lib/JGIT_VERSION b/lib/JGIT_VERSION
index a6ed50a9cb..569cf59666 100644
--- a/lib/JGIT_VERSION
+++ b/lib/JGIT_VERSION
@@ -1,5 +1,4 @@
 include_defs('//lib/jgit/jgit.bzl')
 include_defs('//lib/maven.defs')
 
-REPO = GERRIT
-#REPO = MAVEN_CENTRAL # Leave here even if set to MAVEN_CENTRAL.
+REPO = MAVEN_CENTRAL # Leave here even if set to MAVEN_CENTRAL.
diff --git a/lib/jgit/jgit.bzl b/lib/jgit/jgit.bzl
index 11bcec51a5..2982588d3b 100644
--- a/lib/jgit/jgit.bzl
+++ b/lib/jgit/jgit.bzl
@@ -1,6 +1,5 @@
-JGIT_VERS = "4.5.0.201609210915-r.115-g81f9c1843"
+JGIT_VERS = "4.6.0.201612231935-r"
 
-DOC_VERS = "4.5.0.201609210915-r"
+DOC_VERS = JGIT_VERS # Set to JGIT_VERS unless using a snapshot
 
-#DOC_VERS = JGIT_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 c0272afaf5..b73987f8ab 100644
--- a/lib/jgit/org.eclipse.jgit.archive/BUCK
+++ b/lib/jgit/org.eclipse.jgit.archive/BUCK
@@ -4,7 +4,7 @@ include_defs('//lib/JGIT_VERSION')
 maven_jar(
   name = 'jgit-archive',
   id = 'org.eclipse.jgit:org.eclipse.jgit.archive:' + JGIT_VERS,
-  sha1 = '4a5d058915400c1ef497bfeeb5e87d235213e273',
+  sha1 = 'd44816c7b47746948485430e7372b15108b4bf2e',
   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 29e7e270cc..ab71e7d0ff 100644
--- a/lib/jgit/org.eclipse.jgit.http.server/BUCK
+++ b/lib/jgit/org.eclipse.jgit.http.server/BUCK
@@ -4,7 +4,7 @@ include_defs('//lib/JGIT_VERSION')
 maven_jar(
   name = 'jgit-servlet',
   id = 'org.eclipse.jgit:org.eclipse.jgit.http.server:' + JGIT_VERS,
-  sha1 = '927990025d2970995dbb58f03763eeb776fec8fd',
+  sha1 = '5cb46863efcb208a3a9f729c0b6fd00be0dae6ee',
   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 255b47cb0f..d3808b74e5 100644
--- a/lib/jgit/org.eclipse.jgit.junit/BUCK
+++ b/lib/jgit/org.eclipse.jgit.junit/BUCK
@@ -4,7 +4,7 @@ include_defs('//lib/JGIT_VERSION')
 maven_jar(
   name = 'junit',
   id = 'org.eclipse.jgit:org.eclipse.jgit.junit:' + JGIT_VERS,
-  sha1 = '8e3cb9b1f632fdfea76b04c286a2c0d8d260ebce',
+  sha1 = '42bd9796a68b0de8abf1e0c23ebd4006bf9645e0',
   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 4f5da75e7e..97d2edf6b4 100644
--- a/lib/jgit/org.eclipse.jgit/BUCK
+++ b/lib/jgit/org.eclipse.jgit/BUCK
@@ -4,8 +4,8 @@ include_defs('//lib/JGIT_VERSION')
 maven_jar(
   name = 'jgit',
   id = 'org.eclipse.jgit:org.eclipse.jgit:' + JGIT_VERS,
-  bin_sha1 = '34315f71bb9becf6ff75947a9c43c415b929ec21',
-  src_sha1 = '8320c18472870904eb7fb860af353fea818d07e4',
+  bin_sha1 = 'b705df6cb4c0f4413e6ad52c6cd12011cc6fba4c',
+  src_sha1 = '6ec89bdedccdab092f395016ab761dcdb08f7ffc',
   license = 'jgit',
   repository = REPO,
   unsign = True,