From: Matthias Sohn <matthias.sohn@sap.com>
Date: Wed, 22 Nov 2017 22:46:39 +0000 (+0100)
Subject: Merge branch 'stable-4.8' into stable-4.9
X-Git-Tag: v4.9.1.201712030800-r~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6858339c1e2878d5c5dc6cc9b422f9802be950ae;p=jgit.git

Merge branch 'stable-4.8' into stable-4.9

* stable-4.8:
  Silence boxing warning
  Prepare 4.5.5-SNAPSHOT builds
  JGit v4.5.4.201711221230-r
  Fix LockFile semantics when running on NFS
  Honor trustFolderStats also when reading packed-refs
  Prepare 4.5.4-SNAPSHOT builds
  JGit v4.5.3.201708160445-r

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

6858339c1e2878d5c5dc6cc9b422f9802be950ae
diff --cc org.eclipse.jgit.junit/.settings/.api_filters
index a70ce77e1b,a70ce77e1b..0000000000
deleted file mode 100644,100644
--- a/org.eclipse.jgit.junit/.settings/.api_filters
+++ /dev/null
@@@ -1,35 -1,35 +1,0 @@@
--<?xml version="1.0" encoding="UTF-8" standalone="no"?>
--<component id="org.eclipse.jgit.junit" version="2">
--    <resource path="src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java" type="org.eclipse.jgit.junit.LocalDiskRepositoryTestCase">
--        <filter comment="OK to use internal implementation in tests" id="643842064">
--            <message_arguments>
--                <message_argument value="FileRepository"/>
--                <message_argument value="LocalDiskRepositoryTestCase"/>
--                <message_argument value="createBareRepository()"/>
--            </message_arguments>
--        </filter>
--        <filter comment="OK to use internal implementation in tests" id="643842064">
--            <message_arguments>
--                <message_argument value="FileRepository"/>
--                <message_argument value="LocalDiskRepositoryTestCase"/>
--                <message_argument value="createRepository(boolean, boolean)"/>
--            </message_arguments>
--        </filter>
--        <filter comment="OK to use internal implementation in tests" id="643842064">
--            <message_arguments>
--                <message_argument value="FileRepository"/>
--                <message_argument value="LocalDiskRepositoryTestCase"/>
--                <message_argument value="createWorkRepository()"/>
--            </message_arguments>
--        </filter>
--    </resource>
--    <resource path="src/org/eclipse/jgit/junit/RepositoryTestCase.java" type="org.eclipse.jgit.junit.RepositoryTestCase">
--        <filter comment="OK to use internal implementation in tests" id="627060751">
--            <message_arguments>
--                <message_argument value="FileRepository"/>
--                <message_argument value="RepositoryTestCase"/>
--                <message_argument value="db"/>
--            </message_arguments>
--        </filter>
--    </resource>
--</component>
diff --cc org.eclipse.jgit/.settings/.api_filters
index 20d08c3a00,8a24587e27..894341e5c6
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -1,71 -1,42 +1,86 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <component id="org.eclipse.jgit" version="2">
-     <resource path="src/org/eclipse/jgit/lib/ReflogEntry.java" type="org.eclipse.jgit.lib.ReflogEntry">
-         <filter comment="adding enum constant does not break binary compatibility" id="403767336">
 -    <resource path="META-INF/MANIFEST.MF">
 -        <filter id="924844039">
++    <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
++        <filter id="336658481">
              <message_arguments>
-                 <message_argument value="org.eclipse.jgit.lib.ReflogEntry"/>
-                 <message_argument value="PREFIX_CREATED"/>
 -                <message_argument value="4.8.1"/>
 -                <message_argument value="4.8.0"/>
++                <message_argument value="org.eclipse.jgit.lib.ConfigConstants"/>
++                <message_argument value="CONFIG_KEY_IN_CORE_LIMIT"/>
              </message_arguments>
          </filter>
-         <filter comment="adding enum constant does not break binary compatibility" id="403767336">
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
+         <filter id="336658481">
              <message_arguments>
-                 <message_argument value="org.eclipse.jgit.lib.ReflogEntry"/>
-                 <message_argument value="PREFIX_FAST_FORWARD"/>
+                 <message_argument value="org.eclipse.jgit.lib.ConfigConstants"/>
+                 <message_argument value="CONFIG_KEY_SUPPORTSATOMICFILECREATION"/>
              </message_arguments>
          </filter>
-         <filter comment="adding enum constant does not break binary compatibility" id="403767336">
++        <filter id="336658481">
 +            <message_arguments>
-                 <message_argument value="org.eclipse.jgit.lib.ReflogEntry"/>
-                 <message_argument value="PREFIX_FORCED_UPDATE"/>
++                <message_argument value="org.eclipse.jgit.lib.ConfigConstants"/>
++                <message_argument value="CONFIG_MERGE_SECTION"/>
 +            </message_arguments>
 +        </filter>
-     </resource>
-     <resource path="src/org/eclipse/jgit/merge/MergeStrategy.java" type="org.eclipse.jgit.merge.MergeStrategy">
-         <filter comment="OSGi semantic versioning allows breaking implementors of an API in a minor version" id="336695337">
+         <filter id="1141899266">
              <message_arguments>
-                 <message_argument value="org.eclipse.jgit.merge.MergeStrategy"/>
-                 <message_argument value="newMerger(ObjectInserter, Config)"/>
+                 <message_argument value="4.5"/>
 -                <message_argument value="4.8"/>
++                <message_argument value="4.9"/>
+                 <message_argument value="CONFIG_KEY_SUPPORTSATOMICFILECREATION"/>
              </message_arguments>
          </filter>
      </resource>
-     <resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger">
-         <filter comment="OSGi semantic versioning allows breaking implementors of an API in a minor version" id="338792546">
++    <resource path="src/org/eclipse/jgit/lib/ReflogEntry.java" type="org.eclipse.jgit.lib.ReflogEntry">
++        <filter comment="adding enum constant does not break binary compatibility" id="403767336">
 +            <message_arguments>
-                 <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
-                 <message_argument value="processEntry(CanonicalTreeParser, CanonicalTreeParser, CanonicalTreeParser, DirCacheBuildIterator, WorkingTreeIterator, boolean)"/>
++                <message_argument value="org.eclipse.jgit.lib.ReflogEntry"/>
++                <message_argument value="PREFIX_CREATED"/>
 +            </message_arguments>
 +        </filter>
-         <filter id="1141899266">
++        <filter comment="adding enum constant does not break binary compatibility" id="403767336">
 +            <message_arguments>
-                 <message_argument value="3.5"/>
-                 <message_argument value="4.9"/>
-                 <message_argument value="processEntry(CanonicalTreeParser, CanonicalTreeParser, CanonicalTreeParser, DirCacheBuildIterator, WorkingTreeIterator, boolean)"/>
++                <message_argument value="org.eclipse.jgit.lib.ReflogEntry"/>
++                <message_argument value="PREFIX_FAST_FORWARD"/>
 +            </message_arguments>
 +        </filter>
-         <filter id="1143996420">
++        <filter comment="adding enum constant does not break binary compatibility" id="403767336">
 +            <message_arguments>
-                 <message_argument value="processEntry(CanonicalTreeParser, CanonicalTreeParser, CanonicalTreeParser, DirCacheBuildIterator, WorkingTreeIterator, boolean)"/>
++                <message_argument value="org.eclipse.jgit.lib.ReflogEntry"/>
++                <message_argument value="PREFIX_FORCED_UPDATE"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/transport/http/HttpConnection.java" type="org.eclipse.jgit.transport.http.HttpConnection">
 +        <filter id="403767336">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.transport.http.HttpConnection"/>
 +                <message_argument value="HTTP_11_MOVED_TEMP"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="403767336">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.transport.http.HttpConnection"/>
 +                <message_argument value="HTTP_MOVED_TEMP"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="403767336">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.transport.http.HttpConnection"/>
 +                <message_argument value="HTTP_SEE_OTHER"/>
 +            </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.5"/>
 -                <message_argument value="4.8"/>
++                <message_argument value="4.9"/>
+                 <message_argument value="createNewFile(File)"/>
+             </message_arguments>
+         </filter>
+         <filter id="1141899266">
+             <message_arguments>
+                 <message_argument value="4.5"/>
 -                <message_argument value="4.8"/>
++                <message_argument value="4.9"/>
+                 <message_argument value="supportsAtomicCreateNewFile()"/>
+             </message_arguments>
+         </filter>
+     </resource>
  </component>