Merge branch 'stable-5.4'

* stable-5.4:
  Fix NPE in RebaseTodoFile#parseComments
  Fix NPE in ObjectIdOwnerMap#get
  Fix NPE in CommitOnlyTest#getHead
  FileUtils#lastModifiedInstant should not log error if path doesn't exist
  Cache user global and system-wide git configurations
  Avoid setup and saving FileStoreAttributes compete for ~/.gitconfig lock
  Add missing dependencies for running FS_POSIXTest in Eclipse
  Fix javadoc for SystemReader#getInstance
  Upgrade tycho-extras to 1.4.0
  Improve retry handling when saving FileStoreAttributes fails
  Ensure FSTest uses MockSystemReader
  Make supportsAtomicCreateNewFile return true as default
  Update orbit to R20190602212107-2019-06 to enable backports from master
  Handle InvalidPathException in FS_POSIX#createNewFileAtomic
  Ensure root cause of lock creation failures is logged
  Implement toString in MockSystemReader and MockConfig
  LocalDiskRefTreeDatabaseTest shall use MockSystemReader
  Ensure LocalDiskRepositoryTestCase#setup fully uses MockSystemReader
  Ensure we use MockSystemReader in tests
  Override FileBasedConfig's save method in MockConfig
  Remove FileBasedConfig.load(boolean) introduced in d45219ba
  Disable debug log for FS in org.eclipse.jgit.test
  Bazel: enable logging for tests in org.eclipse.jgit.test
  LockFile: log exception if creation of lock file failed
  Stop using deprecated Constants.CHARACTER_ENCODING

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

diff --cc org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java
Simple merge

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
index f5eca33acfe55ee4dc947002ca02f47b6b083b26,36660ff3e6e35c3cafb1425afe117a4e38060a1c..5a9714f2eab7e79a67e503a8a84059df08ad2856
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.10" sequenceNumber="1560816180">
 -<target name="jgit-4.10" sequenceNumber="1566251637">
++<target name="jgit-4.10" sequenceNumber="1566252827">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target
index bdbc75a9bf92d399f6de178556316d22c0a38725,afa4b3da2cc617db208692402f7967087a21e1b8..c00aebd4f50fcf8a1bc60e0b81acfa9a347810a4
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.11" sequenceNumber="1560816197">
 -<target name="jgit-4.11" sequenceNumber="1566251633">
++<target name="jgit-4.11" sequenceNumber="1566252823">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12-staging.target
index e98c89e4d7abb8f9f3cb5d9f1dc483a0c89c2e79,92c9a88366b83699bac3a1b101d65e850f91a2d2..a79aeb01698693f28aca316ed7b1fb089054e484
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12-staging.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12-staging.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12-staging.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.12-staging" sequenceNumber="1560816219">
 -<target name="jgit-4.12-staging" sequenceNumber="1566251632">
++<target name="jgit-4.12-staging" sequenceNumber="1566252818">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
index 308f9f9f8069957c84b7f07d198306a792c99cb7,9724939f8a967a893b6220bfcc7e1ef87f3e7cb2..082f5d4b4afec4b467e5ab06692ffba402f28fec
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.6" sequenceNumber="1560816227">
 -<target name="jgit-4.6" sequenceNumber="1566251641">
++<target name="jgit-4.6" sequenceNumber="1566252830">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
index eeae219049e39010e31b0fcd4001cdac72e58a8a,6bd70e0160bd395b65523fa726612428f27ed80b..aff5ce6a26bdbfc12b6f7e1b6755e8bec986068d
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.7" sequenceNumber="1560816219">
 -<target name="jgit-4.7" sequenceNumber="1566251627">
++<target name="jgit-4.7" sequenceNumber="1566252816">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
index 4ada70f91306ea4a8113fbf4907a8d6b53215c71,e33ece710ac2632c1c886e5f0899c7490da6ccfb..4995bae26dd45ce72869f6d2cd9bf7f569deb9fb
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.8" sequenceNumber="1560816217">
 -<target name="jgit-4.8" sequenceNumber="1566251616">
++<target name="jgit-4.8" sequenceNumber="1566252807">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target
index 97c9de3695ea57a5601918aec9502f6b425ae6ed,9b3fe1b930f299190d91c95b924bcdb29af75b96..debd6164af45c83a2f519f96ba10c27e67ee787a
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.9" sequenceNumber="1560816222">
 -<target name="jgit-4.9" sequenceNumber="1566251604">
++<target name="jgit-4.9" sequenceNumber="1566252778">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>

diff --cc org.eclipse.jgit.test/META-INF/MANIFEST.MF
Simple merge

diff --cc org.eclipse.jgit/.settings/.api_filters
Simple merge

diff --cc org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java
Simple merge

diff --cc pom.xml
index 8da9a88b570e982421148e1cb16e7e9ba1a5ab0c,1d4f4645a1794b654eeff2418970153f59711770..0deeb7f6c77e0146c88fe528e6a52fb8f9d798aa
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -199,13 -199,14 +199,13 @@@
      <httpcore-version>4.4.10</httpcore-version>
      <slf4j-version>1.7.2</slf4j-version>
      <log4j-version>1.2.15</log4j-version>
 -    <maven-javadoc-plugin-version>3.1.0</maven-javadoc-plugin-version>
 +    <maven-javadoc-plugin-version>3.1.1</maven-javadoc-plugin-version>
-     <tycho-extras-version>1.3.0</tycho-extras-version>
+     <tycho-extras-version>1.4.0</tycho-extras-version>
      <gson-version>2.8.2</gson-version>
      <bouncycastle-version>1.61</bouncycastle-version>
 -    <spotbugs-maven-plugin-version>3.1.12</spotbugs-maven-plugin-version>
 +    <spotbugs-maven-plugin-version>3.1.12.2</spotbugs-maven-plugin-version>
      <maven-project-info-reports-plugin-version>3.0.0</maven-project-info-reports-plugin-version>
      <maven-jxr-plugin-version>3.0.0</maven-jxr-plugin-version>
 -    <spotbugs-maven-plugin-version>3.1.12</spotbugs-maven-plugin-version>
      <maven-surefire-plugin-version>3.0.0-M3</maven-surefire-plugin-version>
      <maven-surefire-report-plugin-version>${maven-surefire-plugin-version}</maven-surefire-report-plugin-version>
      <maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version>