From: Matthias Sohn <matthias.sohn@sap.com>
Date: Mon, 10 Sep 2018 19:30:41 +0000 (+0200)
Subject: Merge branch 'stable-5.0' into stable-5.1
X-Git-Tag: v5.1.0.201809111528-r~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F69%2F129069%2F1;p=jgit.git

Merge branch 'stable-5.0' into stable-5.1

* stable-5.0:
  Prepare 4.11.3-SNAPSHOT builds
  JGit v4.11.2.201809100523-r

Change-Id: I6bd3cb830b7b44dc6e5fd66ff0732957be6b5710
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---

c857e7f09bf1f4f4ab89888bd4e7c17d29981b40
diff --cc org.eclipse.jgit/.settings/.api_filters
index 08fa8b3b59,e7ea220dca..9e56703c57
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -3,10 -3,16 +3,16 @@@
      <resource path="META-INF/MANIFEST.MF">
          <filter id="924844039">
              <message_arguments>
 -                <message_argument value="5.0.3"/>
 -                <message_argument value="5.0.0"/>
 +                <message_argument value="5.1.0"/>
 +                <message_argument value="5.1.0"/>
              </message_arguments>
          </filter>
+         <filter id="924844039">
+             <message_arguments>
+                 <message_argument value="5.0.4"/>
+                 <message_argument value="5.0.0"/>
+             </message_arguments>
+         </filter>
      </resource>
      <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS">
          <filter id="1141899266">