Merge branch 'stable-5.2' into stable-5.3

* stable-5.2:
  Remove unused import in ApacheSshTest
  Update maven plugins
  Ignore missing javadoc in test bundles
  storage: file: De-duplicate File.exists()+File.isFile()
  RefDirectory.scanRef: Re-use file existence check done in snapshot creation
  FileSnapshot: Lazy load file store attributes cache
  Update eclipse-jarsigner-plugin to 1.3.2
  Fix p2 repository URLs

Change-Id: Id989365446cb55b9188e02e6e1f8cbc8ab71071c

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
index 86653bef028185200273f15512105819944d1734,268fbc7575c6b67182e7bfc1fb63fe3729a43eca..8176f0c82729bcf59a706644297a7581d802f453
--- 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,26 -1,26 +1,26 @@@
  <?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="1566244557">
 -<target name="jgit-4.9-staging" sequenceNumber="1638575042">
++<target name="jgit-4.10" sequenceNumber="1638578807">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 -      <unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.client.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.continuation" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.continuation.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.http" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.http.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.io" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.io.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.security" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.security.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.server" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.server.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.servlet" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.servlet.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.util" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.util.source" version="9.4.11.v20180605"/>
 -      <repository id="jetty-9.4.11" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.11.v20180605/"/>
 +      <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.client.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util.source" version="9.4.14.v20181114"/>
-       <repository id="jetty-9.4.14" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.14.v20181114"/>
++      <repository id="jetty-9.4.14" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.14.v20181114"/>
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.apache.ant" version="1.10.5.v20190526-1402"/>
@@@ -86,7 -80,7 +86,7 @@@
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.osgi" version="0.0.0"/>
--      <repository location="http://download.eclipse.org/releases/2018-12/"/>
++      <repository location="https://download.eclipse.org/releases/2018-12/"/>
      </location>
    </locations>
  </target>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd
index 6beb42e33af41cde20ecdade5eccd2b7b4722166,71230d705ea47059dfccb5d4661c78ad407c3cd5..fad2e92005cc5b5062e559eb76182c9e668f811c
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd
@@@ -1,8 -1,8 +1,9 @@@
 -target "jgit-4.9-staging" with source configurePhase
 +target "jgit-4.10" with source configurePhase
  
 -include "projects/jetty-9.4.11.tpd"
 +include "projects/jetty-9.4.14.tpd"
  include "orbit/R20190602212107-2019-06.tpd"
  
--location "http://download.eclipse.org/releases/2018-12/" {
++location "https://download.eclipse.org/releases/2018-12/" {
        org.eclipse.osgi lazy
 -}
 +}
++

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..414e02cefb9c5a8b048b44cf40c7e53f7994a6f4
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target
@@@ -1,0 -1,0 +1,92 @@@
++<?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="1638579452">
++  <locations>
++    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
++      <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>
++      <unit id="org.eclipse.jetty.client.source" version="9.4.14.v20181114"/>
++      <unit id="org.eclipse.jetty.continuation" version="9.4.14.v20181114"/>
++      <unit id="org.eclipse.jetty.continuation.source" version="9.4.14.v20181114"/>
++      <unit id="org.eclipse.jetty.http" version="9.4.14.v20181114"/>
++      <unit id="org.eclipse.jetty.http.source" version="9.4.14.v20181114"/>
++      <unit id="org.eclipse.jetty.io" version="9.4.14.v20181114"/>
++      <unit id="org.eclipse.jetty.io.source" version="9.4.14.v20181114"/>
++      <unit id="org.eclipse.jetty.security" version="9.4.14.v20181114"/>
++      <unit id="org.eclipse.jetty.security.source" version="9.4.14.v20181114"/>
++      <unit id="org.eclipse.jetty.server" version="9.4.14.v20181114"/>
++      <unit id="org.eclipse.jetty.server.source" version="9.4.14.v20181114"/>
++      <unit id="org.eclipse.jetty.servlet" version="9.4.14.v20181114"/>
++      <unit id="org.eclipse.jetty.servlet.source" version="9.4.14.v20181114"/>
++      <unit id="org.eclipse.jetty.util" version="9.4.14.v20181114"/>
++      <unit id="org.eclipse.jetty.util.source" version="9.4.14.v20181114"/>
++      <repository id="jetty-9.4.14" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.14.v20181114"/>
++    </location>
++    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
++      <unit id="org.apache.ant" version="1.10.5.v20190526-1402"/>
++      <unit id="org.apache.ant.source" version="1.10.5.v20190526-1402"/>
++      <unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
++      <unit id="org.apache.commons.codec.source" version="1.10.0.v20180409-1845"/>
++      <unit id="org.apache.commons.compress" version="1.18.0.v20181121-2221"/>
++      <unit id="org.apache.commons.compress.source" version="1.18.0.v20181121-2221"/>
++      <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
++      <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
++      <unit id="org.apache.httpcomponents.httpclient" version="4.5.6.v20190503-0009"/>
++      <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.6.v20190503-0009"/>
++      <unit id="org.apache.httpcomponents.httpcore" version="4.4.10.v20190123-2214"/>
++      <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.10.v20190123-2214"/>
++      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
++      <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
++      <unit id="org.bouncycastle.bcpg" version="1.60.0.v20181210-2057"/>
++      <unit id="org.bouncycastle.bcpg.source" version="1.60.0.v20181210-2057"/>
++      <unit id="org.bouncycastle.bcpkix" version="1.60.0.v20181210-2057"/>
++      <unit id="org.bouncycastle.bcpkix.source" version="1.60.0.v20181210-2057"/>
++      <unit id="org.bouncycastle.bcprov" version="1.60.0.v20181210-2057"/>
++      <unit id="org.bouncycastle.bcprov.source" version="1.60.0.v20181210-2057"/>
++      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
++      <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
++      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
++      <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
++      <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
++      <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
++      <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
++      <unit id="javaewah" version="1.1.6.v20160919-1400"/>
++      <unit id="javaewah.source" version="1.1.6.v20160919-1400"/>
++      <unit id="org.objenesis" version="2.6.0.v20180420-1519"/>
++      <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
++      <unit id="org.mockito" version="2.23.0.v20190527-1420"/>
++      <unit id="org.mockito.source" version="2.23.0.v20190527-1420"/>
++      <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
++      <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
++      <unit id="net.bytebuddy.byte-buddy-agent" version="1.9.0.v20181106-1534"/>
++      <unit id="net.bytebuddy.byte-buddy-agent.source" version="1.9.0.v20181106-1534"/>
++      <unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
++      <unit id="com.google.gson.source" version="2.8.2.v20180104-1110"/>
++      <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
++      <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
++      <unit id="org.junit" version="4.12.0.v201504281640"/>
++      <unit id="org.junit.source" version="4.12.0.v201504281640"/>
++      <unit id="javax.servlet" version="3.1.0.v201410161800"/>
++      <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
++      <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
++      <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
++      <unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
++      <unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
++      <unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
++      <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
++      <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
++      <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
++      <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
++      <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
++      <unit id="org.apache.sshd.core" version="2.0.0.v20181102-1323"/>
++      <unit id="org.apache.sshd.core.source" version="2.0.0.v20181102-1323"/>
++      <unit id="org.apache.sshd.sftp" version="2.0.0.v20181102-1323"/>
++      <unit id="org.apache.sshd.sftp.source" version="2.0.0.v20181102-1323"/>
++      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository"/>
++    </location>
++    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
++      <unit id="org.eclipse.osgi" version="0.0.0"/>
++      <repository location="https://download.eclipse.org/releases/2019-03/"/>
++    </location>
++  </locations>
++</target>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.tpd
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..0864e7647f854bf5773a8b30aeafccbcc5eda2da
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.tpd
@@@ -1,0 -1,0 +1,8 @@@
++target "jgit-4.11" with source configurePhase
++
++include "projects/jetty-9.4.14.tpd"
++include "orbit/R20190602212107-2019-06.tpd"
++
++location "https://download.eclipse.org/releases/2019-03/" {
++      org.eclipse.osgi lazy
++}

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
index 05488b9c3d7efc356d90eacaabf6b06cc4d30895,bc1c54f52e25024089e4f28f106a0b0f818b5461..1a9608e611ce8c377fcf1f9e0b37db11a9e80a14
--- 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,26 -1,26 +1,26 @@@
  <?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="1566244561">
 -<target name="jgit-4.6" sequenceNumber="1638575051">
++<target name="jgit-4.6" sequenceNumber="1638579461">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 -      <unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.client.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.continuation" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.continuation.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.http" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.http.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.io" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.io.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.security" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.security.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.server" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.server.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.servlet" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.servlet.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.util" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.util.source" version="9.4.11.v20180605"/>
 -      <repository id="jetty-9.4.11" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.11.v20180605/"/>
 +      <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.client.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util.source" version="9.4.14.v20181114"/>
-       <repository id="jetty-9.4.14" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.14.v20181114"/>
++      <repository id="jetty-9.4.14" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.14.v20181114"/>
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.apache.ant" version="1.10.5.v20190526-1402"/>
@@@ -86,7 -80,7 +86,7 @@@
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.osgi" version="0.0.0"/>
--      <repository location="http://download.eclipse.org/releases/neon/"/>
++      <repository location="https://download.eclipse.org/releases/neon/"/>
      </location>
    </locations>
  </target>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd
index 1a2c9a3a16e28085ef25459fd7f1fe3245cb3f75,8b3dd0b4766182ac04fa91275c6be73ee0202a12..a43593f29b57a47284b250cbe6b2e8818926b8d1
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd
@@@ -1,8 -1,8 +1,8 @@@
  target "jgit-4.6" with source configurePhase
  
 -include "projects/jetty-9.4.11.tpd"
 +include "projects/jetty-9.4.14.tpd"
  include "orbit/R20190602212107-2019-06.tpd"
  
--location "http://download.eclipse.org/releases/neon/" {
++location "https://download.eclipse.org/releases/neon/" {
        org.eclipse.osgi lazy
  }

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
index e82222a0c5ee4c4be3525996494334c46b0a4a73,596e3c4d04623c188d818cadc8f50e80b67b460f..4d8e451f58d53b2066e52b7e55af0a6074a34cd9
--- 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,26 -1,26 +1,26 @@@
  <?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="1566244564">
 -<target name="jgit-4.7" sequenceNumber="1638575047">
++<target name="jgit-4.7" sequenceNumber="1638579458">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 -      <unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.client.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.continuation" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.continuation.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.http" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.http.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.io" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.io.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.security" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.security.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.server" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.server.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.servlet" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.servlet.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.util" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.util.source" version="9.4.11.v20180605"/>
 -      <repository id="jetty-9.4.11" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.11.v20180605/"/>
 +      <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.client.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util.source" version="9.4.14.v20181114"/>
-       <repository id="jetty-9.4.14" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.14.v20181114"/>
++      <repository id="jetty-9.4.14" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.14.v20181114"/>
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.apache.ant" version="1.10.5.v20190526-1402"/>
@@@ -86,7 -80,7 +86,7 @@@
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.osgi" version="0.0.0"/>
--      <repository location="http://download.eclipse.org/releases/oxygen/"/>
++      <repository location="https://download.eclipse.org/releases/oxygen/"/>
      </location>
    </locations>
  </target>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd
index fc1b046edd1b5b3bcbc36214b8068b336cf56f08,e93fc46b59d73a43d6d7ef734697f309821c8c5b..32835cabbf938437746d81a94174a06816ccbc09
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd
@@@ -1,8 -1,8 +1,8 @@@
  target "jgit-4.7" with source configurePhase
  
 -include "projects/jetty-9.4.11.tpd"
 +include "projects/jetty-9.4.14.tpd"
  include "orbit/R20190602212107-2019-06.tpd"
  
--location "http://download.eclipse.org/releases/oxygen/" {
++location "https://download.eclipse.org/releases/oxygen/" {
        org.eclipse.osgi lazy
  }

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
index 0b353db260c02e68d461af6d172d33269d9647a8,a0e0948600db12cb60d330238ab1f45915685987..491ff48c1ecb1124aed2d56ca0c1b4b0a734f34b
--- 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,26 -1,26 +1,26 @@@
  <?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="1566244569">
 -<target name="jgit-4.8" sequenceNumber="1638575042">
++<target name="jgit-4.8" sequenceNumber="1638579452">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 -      <unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.client.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.continuation" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.continuation.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.http" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.http.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.io" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.io.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.security" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.security.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.server" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.server.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.servlet" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.servlet.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.util" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.util.source" version="9.4.11.v20180605"/>
 -      <repository id="jetty-9.4.11" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.11.v20180605/"/>
 +      <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.client.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util.source" version="9.4.14.v20181114"/>
-       <repository id="jetty-9.4.14" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.14.v20181114"/>
++      <repository id="jetty-9.4.14" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.14.v20181114"/>
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.apache.ant" version="1.10.5.v20190526-1402"/>
@@@ -86,7 -80,7 +86,7 @@@
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.osgi" version="0.0.0"/>
--      <repository location="http://download.eclipse.org/releases/photon/"/>
++      <repository location="https://download.eclipse.org/releases/photon/"/>
      </location>
    </locations>
  </target>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd
index a8f837e9caa243d9cd69e1d8cea9d6d29005f335,ba6337dbf9050d703826aaffb4d5f385075a13ab..c11bc62fc2dbf226166e53f615764cae2d95602e
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd
@@@ -1,8 -1,8 +1,8 @@@
  target "jgit-4.8" with source configurePhase
  
 -include "projects/jetty-9.4.11.tpd"
 +include "projects/jetty-9.4.14.tpd"
  include "orbit/R20190602212107-2019-06.tpd"
  
--location "http://download.eclipse.org/releases/photon/" {
++location "https://download.eclipse.org/releases/photon/" {
        org.eclipse.osgi lazy
  }

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target
index 94a752c74c251744650b5f75d2b48e0404ecc1f7,a4dd92c88cc648b799a2d50ed5891e8a8eb717cf..d3267056794ec2b96d432eb5c83b21efc1dd77b8
--- 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,26 -1,26 +1,26 @@@
  <?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="1566244572">
 -<target name="jgit-4.9" sequenceNumber="1638575042">
++<target name="jgit-4.9" sequenceNumber="1638578807">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 -      <unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.client.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.continuation" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.continuation.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.http" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.http.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.io" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.io.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.security" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.security.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.server" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.server.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.servlet" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.servlet.source" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.util" version="9.4.11.v20180605"/>
 -      <unit id="org.eclipse.jetty.util.source" version="9.4.11.v20180605"/>
 -      <repository id="jetty-9.4.11" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.11.v20180605/"/>
 +      <unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.client.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.continuation.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.http.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.io.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.security.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.server.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.servlet.source" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util" version="9.4.14.v20181114"/>
 +      <unit id="org.eclipse.jetty.util.source" version="9.4.14.v20181114"/>
-       <repository id="jetty-9.4.14" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.14.v20181114"/>
++      <repository id="jetty-9.4.14" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.14.v20181114"/>
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.apache.ant" version="1.10.5.v20190526-1402"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd
index f91f53eb8b921282d6c72a98db599880013b2f00,6ee4c6a84842c55a0146795407475d0b10aaee0b..a2658b43825fd643812b3fb6a72105232db0f55c
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd
@@@ -1,8 -1,8 +1,8 @@@
  target "jgit-4.9" with source configurePhase
  
 -include "projects/jetty-9.4.11.tpd"
 +include "projects/jetty-9.4.14.tpd"
  include "orbit/R20190602212107-2019-06.tpd"
  
- location "http://download.eclipse.org/releases/2018-09/" {
+ location "https://download.eclipse.org/releases/2018-09/" {
        org.eclipse.osgi lazy
  }

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.14.tpd
index 5372e77e5a78769695cc66ea4a40970805c8eac7,0000000000000000000000000000000000000000..fb0963ef730ee3a6da954518d8184e6602e84879
mode 100644,000000..100644
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.14.tpd
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.14.tpd
@@@ -1,20 -1,0 +1,20 @@@
- location jetty-9.4.14 "http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.14.v20181114" {
 +target "jetty-9.4.14" with source configurePhase
 +
++location jetty-9.4.14 "https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.14.v20181114" {
 +      org.eclipse.jetty.client [9.4.14.v20181114,9.4.14.v20181114]
 +      org.eclipse.jetty.client.source [9.4.14.v20181114,9.4.14.v20181114]
 +      org.eclipse.jetty.continuation [9.4.14.v20181114,9.4.14.v20181114]
 +      org.eclipse.jetty.continuation.source [9.4.14.v20181114,9.4.14.v20181114]
 +      org.eclipse.jetty.http [9.4.14.v20181114,9.4.14.v20181114]
 +      org.eclipse.jetty.http.source [9.4.14.v20181114,9.4.14.v20181114]
 +      org.eclipse.jetty.io [9.4.14.v20181114,9.4.14.v20181114]
 +      org.eclipse.jetty.io.source [9.4.14.v20181114,9.4.14.v20181114]
 +      org.eclipse.jetty.security [9.4.14.v20181114,9.4.14.v20181114]
 +      org.eclipse.jetty.security.source [9.4.14.v20181114,9.4.14.v20181114]
 +      org.eclipse.jetty.server [9.4.14.v20181114,9.4.14.v20181114]
 +      org.eclipse.jetty.server.source [9.4.14.v20181114,9.4.14.v20181114]
 +      org.eclipse.jetty.servlet [9.4.14.v20181114,9.4.14.v20181114]
 +      org.eclipse.jetty.servlet.source [9.4.14.v20181114,9.4.14.v20181114]
 +      org.eclipse.jetty.util [9.4.14.v20181114,9.4.14.v20181114]
 +      org.eclipse.jetty.util.source [9.4.14.v20181114,9.4.14.v20181114]
 +}

diff --cc org.eclipse.jgit.packaging/pom.xml
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java
Simple merge

diff --cc pom.xml
index d4032fa440775142705bac87bc075bc8509c8a97,df604a6ed1b8b531b32e70951816cd6dc1e5681b..d5c3a78424b5c2272f4be9634676309e5fb0db9e
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -199,15 -199,13 +199,14 @@@
      <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>
-     <tycho-extras-version>1.3.0</tycho-extras-version>
+     <maven-javadoc-plugin-version>3.3.1</maven-javadoc-plugin-version>
+     <tycho-extras-version>1.7.0</tycho-extras-version>
      <gson-version>2.8.2</gson-version>
-     <spotbugs-maven-plugin-version>3.1.11</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>
 +    <bouncycastle-version>1.60</bouncycastle-version>
+     <maven-project-info-reports-plugin-version>3.1.2</maven-project-info-reports-plugin-version>
+     <maven-jxr-plugin-version>3.1.1</maven-jxr-plugin-version>
+     <spotbugs-maven-plugin-version>4.3.0</spotbugs-maven-plugin-version>
+     <maven-surefire-plugin-version>3.0.0-M5</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>
  
@@@ -415,13 -412,8 +414,13 @@@
          <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-resources-plugin</artifactId>
-           <version>3.1.0</version>
+           <version>3.2.0</version>
          </plugin>
 +        <plugin>
 +          <groupId>org.springframework.boot</groupId>
 +          <artifactId>spring-boot-maven-plugin</artifactId>
 +          <version>2.1.2.RELEASE</version>
 +        </plugin>
        </plugins>
      </pluginManagement>