From: Matthias Sohn <matthias.sohn@sap.com>
Date: Tue, 12 Mar 2019 21:39:53 +0000 (+0100)
Subject: Merge branch 'stable-4.6' into stable-4.7
X-Git-Tag: v4.7.8.201903121755-r~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=92525b584a12fa89baa5ece363a501e60b40958c;p=jgit.git

Merge branch 'stable-4.6' into stable-4.7

* stable-4.6:
  Prepare 4.5.7-SNAPSHOT builds
  JGit v4.5.6.201903121547-r
  Check for packfile validity and fd before reading
  Move throw of PackInvalidException outside the catch
  Use FileSnapshot to get lastModified on PackFile
  Include size when comparing FileSnapshot
  Do not reuse packfiles when changed on filesystem
  Silence API warnings for new API introduced for fixes

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

92525b584a12fa89baa5ece363a501e60b40958c
diff --cc org.eclipse.jgit/.settings/.api_filters
index 1083663327,c74a500aba..9fa97b4e25
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -66,5 -65,27 +66,11 @@@
                  <message_argument value="supportsAtomicCreateNewFile()"/>
              </message_arguments>
          </filter>
 -        <filter id="924844039">
 -            <message_arguments>
 -                <message_argument value="4.5.6"/>
 -                <message_argument value="4.5.0"/>
 -            </message_arguments>
 -        </filter>
 -    </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.ConfigConstants"/>
 -                <message_argument value="CONFIG_KEY_SUPPORTSATOMICFILECREATION"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS">
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="4.5.6"/>
+                 <message_argument value="fileAttributes(File)"/>
+             </message_arguments>
+         </filter>
      </resource>
  </component>
diff --cc org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
index 8d4e5e52af,4a2a2d6f3d..183bf460c5
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
@@@ -53,8 -52,7 +53,9 @@@ import java.io.InputStreamReader
  import java.io.OutputStream;
  import java.io.PrintStream;
  import java.nio.charset.Charset;
 +import java.nio.file.Files;
 +import java.nio.file.Path;
+ import java.nio.file.attribute.BasicFileAttributes;
  import java.security.AccessController;
  import java.security.PrivilegedAction;
  import java.text.MessageFormat;