]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-5.1' 73/129073/2
authorMatthias Sohn <matthias.sohn@sap.com>
Wed, 12 Sep 2018 12:50:44 +0000 (14:50 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Wed, 12 Sep 2018 12:54:49 +0000 (14:54 +0200)
* stable-5.1:
  Fix NoSuchFileException during directory cleanup in RefDirectory
  Update japicmp to 0.13.0
  Prepare 5.1.1-SNAPSHOT builds
  JGit v5.1.0.201809111528-r
  Externalize warning message in RefDirectory.delete()
  Suppress warning for trying to delete non-empty directory
  Fix replacement quoting for replaceAll in filter command
  Prepare 4.11.3-SNAPSHOT builds
  JGit v4.11.2.201809100523-r

Change-Id: Ia27fec6dabf87db26e2fd29c17570932649e234a
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
1  2 
org.eclipse.jgit/.settings/.api_filters
pom.xml

index 08fa8b3b59028e39a1deb38d424871ad98dcafee,9e56703c5798e87265ae150b7a18aaf24e53af53..e5f0e2aaf1cc406e17701cf00b40b610a2fd51e1
@@@ -1,18 -1,24 +1,10 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <component id="org.eclipse.jgit" version="2">
--    <resource path="META-INF/MANIFEST.MF">
--        <filter id="924844039">
--            <message_arguments>
--                <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">
              <message_arguments>
                  <message_argument value="4.7"/>
--                <message_argument value="5.1"/>
++                <message_argument value="5.2"/>
                  <message_argument value="createNewFileAtomic(File)"/>
              </message_arguments>
          </filter>
@@@ -21,7 -27,7 +13,7 @@@
          <filter id="1141899266">
              <message_arguments>
                  <message_argument value="4.7"/>
--                <message_argument value="5.1"/>
++                <message_argument value="5.2"/>
                  <message_argument value="LockToken"/>
              </message_arguments>
          </filter>
diff --cc pom.xml
Simple merge