From d06c1b976961b8484572487a98f37da0b8fd5c1d Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Mar 13 2019 20:23:26 +0000
Subject: Update to 2019-03 release


---

diff --git a/0004-Avoid-NPE-in-ObjectId.isId.patch b/0004-Avoid-NPE-in-ObjectId.isId.patch
deleted file mode 100644
index 3455cde..0000000
--- a/0004-Avoid-NPE-in-ObjectId.isId.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 3388f58c19a22c55608a40b7585602881f8de44f Mon Sep 17 00:00:00 2001
-From: Michael Keppler <Michael.Keppler@gmx.de>
-Date: Sat, 9 Mar 2019 12:37:10 +0100
-Subject: [PATCH 4/5] Avoid NPE in ObjectId.isId()
-
-That method can easily be invoked with a null argument (e.g.
-isId(repo.getFullBranch()), therefore it should handle null arguments.
-
-Change was suggested in https://git.eclipse.org/r/#/c/137918/, which
-tried to fix the same in egit only.
-
-Bug:544982
-Change-Id: I32d1df6e9b2946ab324eda7008721159019316b3
-Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
----
- org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectId.java | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectId.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectId.java
-index 764f890..0e96138 100644
---- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectId.java
-+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectId.java
-@@ -49,6 +49,7 @@
- import java.io.ObjectOutputStream;
- import java.io.Serializable;
- 
-+import org.eclipse.jgit.annotations.Nullable;
- import org.eclipse.jgit.errors.InvalidObjectIdException;
- import org.eclipse.jgit.util.NB;
- import org.eclipse.jgit.util.RawParseUtils;
-@@ -86,7 +87,10 @@ public static final ObjectId zeroId() {
- 	 *            the string to test.
- 	 * @return true if the string can converted into an ObjectId.
- 	 */
--	public static final boolean isId(String id) {
-+	public static final boolean isId(@Nullable String id) {
-+		if (id == null) {
-+			return false;
-+		}
- 		if (id.length() != Constants.OBJECT_ID_STRING_LENGTH)
- 			return false;
- 		try {
--- 
-2.20.1
-
diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec
index 8ff04e4..3f01663 100644
--- a/eclipse-jgit.spec
+++ b/eclipse-jgit.spec
@@ -1,4 +1,4 @@
-%global gittag 5.3.0.201903061415-rc1
+%global gittag 5.3.0.201903130848-r
 
 # Due to circular self-dependency, one build must be done with this flag set
 # when updating to new versions. A second build without this flag ensures that
@@ -7,7 +7,7 @@
 
 Name:           eclipse-jgit
 Version:        5.3.0
-Release:        0.5%{?dist}
+Release:        1%{?dist}
 Summary:        Eclipse JGit
 
 License:        BSD
@@ -23,10 +23,8 @@ Patch0:         0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch
 Patch1:         0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch
 # Changes necessary for the latest version of apache-sshd
 Patch2:         0003-Port-to-apache-sshd-2.2.0.patch
-# Back ported fix, see: https://git.eclipse.org/c/jgit/jgit.git/commit/?h=stable-5.3&id=391c7a25fa8d247f9f6087f9f19ee330540ad602
-Patch3:         0004-Avoid-NPE-in-ObjectId.isId.patch
 # Changes necessary for the latest version of bouncycastle
-Patch4:         0005-Port-to-bouncycastle-1.61-API.patch
+Patch3:         0005-Port-to-bouncycastle-1.61-API.patch
 
 BuildArch: noarch
 
@@ -102,7 +100,6 @@ Command line Git tool built entirely in Java.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 # Disable multithreaded build
 rm .mvn/maven.config
@@ -213,6 +210,9 @@ EOF
 %endif
 
 %changelog
+* Wed Mar 13 2019 Mat Booth <mat.booth@redhat.com> - 5.3.0-1
+- Update to 2019-03 release
+
 * Wed Mar 13 2019 Mat Booth <mat.booth@redhat.com> - 5.3.0-0.5
 - Full build
 
diff --git a/sources b/sources
index 57f3689..c372bbd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jgit-5.3.0.201903061415-rc1.tar.xz) = 5b8e6bfb49039c5c7d071d2d25561ad4aa53239675add1ee77e92245cf1babb55004bc3029cb4bb1a81c1a3b29b408642a38717e0b8d1c442cd840f547e0e7f6
+SHA512 (jgit-5.3.0.201903130848-r.tar.xz) = da7cb1c8b6da587e4b3c12519ddc43aea286b03a568bb27824f7d01c3cdda8b7e27fc7b6eae7d048fc0b8f8fd38875a920fa3ebd4a49601e8de935e1efe57324