]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-4.11' into stable-5.0 68/129068/1
authorMatthias Sohn <matthias.sohn@sap.com>
Mon, 10 Sep 2018 19:29:46 +0000 (21:29 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Mon, 10 Sep 2018 19:29:46 +0000 (21:29 +0200)
* 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>
1  2 
org.eclipse.jgit/.settings/.api_filters

index 803a29a5ec6c63d9b2a3cc826c7f75fe44353a7d,e6e3309225908897bea1772c633acaedcb8f2dd6..e7ea220dcaf452f334488368a36090ba3d044bd3
@@@ -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">