From: Matthias Sohn <matthias.sohn@sap.com>
Date: Mon, 10 Sep 2018 19:29:46 +0000 (+0200)
Subject: Merge branch 'stable-4.11' into stable-5.0
X-Git-Tag: v5.1.0.201809111528-r~2^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8527e74ea0ed9413bf8d7fd2bb091b607d1e28b6;p=jgit.git

Merge branch 'stable-4.11' into stable-5.0

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

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

8527e74ea0ed9413bf8d7fd2bb091b607d1e28b6
diff --cc org.eclipse.jgit/.settings/.api_filters
index 803a29a5ec,e6e3309225..e7ea220dca
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -3,10 -3,19 +3,16 @@@
      <resource path="META-INF/MANIFEST.MF">
          <filter id="924844039">
              <message_arguments>
 -                <message_argument value="4.11.2"/>
 -                <message_argument value="4.11.0"/>
 +                <message_argument value="5.0.3"/>
 +                <message_argument value="5.0.0"/>
              </message_arguments>
          </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/lib/Constants.java" type="org.eclipse.jgit.lib.Constants">
 -        <filter id="1141899266">
++        <filter id="924844039">
+             <message_arguments>
 -                <message_argument value="4.7"/>
 -                <message_argument value="4.11"/>
 -                <message_argument value="LOCK_SUFFIX"/>
++                <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">