Merge branch 'stable-5.13' into stable-6.0

* stable-5.13:
  Add missing @since tags
  Add missing @since tag
  Add missing @since tags
  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: Icea0a4dced9688392e7f2411b98df52aed2b9c8c

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target
index 737cadaf904c00dee5c937f0cc7013e33f992894,d30067701f734b91c1266642c1e485f23b78db66..6d960335dc46debfd59d589bcad04bfe45f14f39
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target
@@@ -1,30 -1,32 +1,30 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.17" sequenceNumber="1637746569">
 -<target name="jgit-4.17" sequenceNumber="1638648143">
++<target name="jgit-4.17" sequenceNumber="1638648728">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 -      <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
 -      <repository id="jetty-9.4.x" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.43.v20210629/"/>
 +      <unit id="jakarta.servlet-api" version="4.0.0"/>
 +      <unit id="jakarta.servlet-api.source" version="4.0.0"/>
 +      <unit id="org.eclipse.jetty.http" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.http.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.io" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.io.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.security" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.security.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.server" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.server.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.servlet" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.servlet.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util.ajax" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util.ajax.source" version="10.0.6"/>
 +      <repository id="jetty-10.0.x" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/>
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 -      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
 -      <unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
 +      <unit id="com.google.gson" version="2.8.8.v20211029-0838"/>
 +      <unit id="com.google.gson.source" version="2.8.8.v20211029-0838"/>
        <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="com.jcraft.jzlib" version="1.1.1.v201205102305"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target
index 55cadffa88c9ec18b6d150fdc3de58b187e3d554,5421fd4b34d441be4ed39981a0b8a3d6150522ef..cbe26bbf16a3d3de8218243c3c0ed10e694ef2fe
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target
@@@ -1,30 -1,32 +1,30 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.18" sequenceNumber="1637746569">
 -<target name="jgit-4.18" sequenceNumber="1638648143">
++<target name="jgit-4.18" sequenceNumber="1638648728">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 -      <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
 -      <repository id="jetty-9.4.x" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.43.v20210629/"/>
 +      <unit id="jakarta.servlet-api" version="4.0.0"/>
 +      <unit id="jakarta.servlet-api.source" version="4.0.0"/>
 +      <unit id="org.eclipse.jetty.http" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.http.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.io" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.io.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.security" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.security.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.server" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.server.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.servlet" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.servlet.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util.ajax" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util.ajax.source" version="10.0.6"/>
 +      <repository id="jetty-10.0.x" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/>
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 -      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
 -      <unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
 +      <unit id="com.google.gson" version="2.8.8.v20211029-0838"/>
 +      <unit id="com.google.gson.source" version="2.8.8.v20211029-0838"/>
        <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="com.jcraft.jzlib" version="1.1.1.v201205102305"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target
index 43fe4c8417331275e4074cbae3ea80171142938d,b49567999a938c3d68dd5ae8ae0ee0e379f0d10d..ceff3052c343b55944cc649ff962127933f36908
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target
@@@ -1,30 -1,32 +1,30 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.19-staging" sequenceNumber="1637746569">
 -<target name="jgit-4.19-staging" sequenceNumber="1638648143">
++<target name="jgit-4.19-staging" sequenceNumber="1638648728">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 -      <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
 -      <repository id="jetty-9.4.x" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.43.v20210629/"/>
 +      <unit id="jakarta.servlet-api" version="4.0.0"/>
 +      <unit id="jakarta.servlet-api.source" version="4.0.0"/>
 +      <unit id="org.eclipse.jetty.http" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.http.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.io" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.io.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.security" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.security.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.server" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.server.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.servlet" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.servlet.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util.ajax" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util.ajax.source" version="10.0.6"/>
 +      <repository id="jetty-10.0.x" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/>
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 -      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
 -      <unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
 +      <unit id="com.google.gson" version="2.8.8.v20211029-0838"/>
 +      <unit id="com.google.gson.source" version="2.8.8.v20211029-0838"/>
        <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="com.jcraft.jzlib" version="1.1.1.v201205102305"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target
index aefa34122bae977acc69e53aaf721ce9daf3c46c,5ce30c60c0fb82ac3138e3cca6d3d5c96371a73b..e2fed0675a8b997e4db459af650b374dae0f7036
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target
@@@ -1,30 -1,32 +1,30 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.20" sequenceNumber="1637746569">
 -<target name="jgit-4.20" sequenceNumber="1638648143">
++<target name="jgit-4.20" sequenceNumber="1638648728">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 -      <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
 -      <repository id="jetty-9.4.x" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.43.v20210629/"/>
 +      <unit id="jakarta.servlet-api" version="4.0.0"/>
 +      <unit id="jakarta.servlet-api.source" version="4.0.0"/>
 +      <unit id="org.eclipse.jetty.http" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.http.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.io" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.io.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.security" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.security.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.server" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.server.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.servlet" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.servlet.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util.ajax" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util.ajax.source" version="10.0.6"/>
 +      <repository id="jetty-10.0.x" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/>
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 -      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
 -      <unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
 +      <unit id="com.google.gson" version="2.8.8.v20211029-0838"/>
 +      <unit id="com.google.gson.source" version="2.8.8.v20211029-0838"/>
        <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="com.jcraft.jzlib" version="1.1.1.v201205102305"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target
index 1b6cf26a5e521c0de50490326da06cc8872aa5d6,8151147d9b0708582874fa06fcf46ab777234238..4bd55466ecd6c1d7f9d7b0c7a7cb754ec57e07e0
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target
@@@ -1,30 -1,32 +1,30 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
- <target name="jgit-4.21" sequenceNumber="1637746569">
 -<target name="jgit-4.21" sequenceNumber="1638648146">
++<target name="jgit-4.21" sequenceNumber="1638648728">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 -      <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
 -      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
 -      <repository id="jetty-9.4.x" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.43.v20210629/"/>
 +      <unit id="jakarta.servlet-api" version="4.0.0"/>
 +      <unit id="jakarta.servlet-api.source" version="4.0.0"/>
 +      <unit id="org.eclipse.jetty.http" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.http.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.io" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.io.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.security" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.security.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.server" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.server.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.servlet" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.servlet.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util.ajax" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util.ajax.source" version="10.0.6"/>
 +      <repository id="jetty-10.0.x" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/>
      </location>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 -      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
 -      <unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
 +      <unit id="com.google.gson" version="2.8.8.v20211029-0838"/>
 +      <unit id="com.google.gson.source" version="2.8.8.v20211029-0838"/>
        <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="com.jcraft.jzlib" version="1.1.1.v201205102305"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target
index 7fd003277ac8b6b46c8fb4b40be2016285b3eeee,0000000000000000000000000000000000000000..98f44a8dc2ce39d8cba62fdfd607b5b5f3d9ec61
mode 100644,000000..100644
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target
@@@ -1,99 -1,0 +1,99 @@@
- <target name="jgit-4.22" sequenceNumber="1637746993">
 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 +<?pde?>
 +<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
++<target name="jgit-4.22" sequenceNumber="1638648736">
 +  <locations>
 +    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 +      <unit id="jakarta.servlet-api" version="4.0.0"/>
 +      <unit id="jakarta.servlet-api.source" version="4.0.0"/>
 +      <unit id="org.eclipse.jetty.http" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.http.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.io" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.io.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.security" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.security.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.server" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.server.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.servlet" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.servlet.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util.source" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util.ajax" version="10.0.6"/>
 +      <unit id="org.eclipse.jetty.util.ajax.source" version="10.0.6"/>
 +      <repository id="jetty-10.0.x" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/>
 +    </location>
 +    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
 +      <unit id="com.google.gson" version="2.8.8.v20211029-0838"/>
 +      <unit id="com.google.gson.source" version="2.8.8.v20211029-0838"/>
 +      <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="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
 +      <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
 +      <unit id="com.sun.jna" version="5.8.0.v20210503-0343"/>
 +      <unit id="com.sun.jna.source" version="5.8.0.v20210503-0343"/>
 +      <unit id="com.sun.jna.platform" version="5.8.0.v20210406-1004"/>
 +      <unit id="com.sun.jna.platform.source" version="5.8.0.v20210406-1004"/>
 +      <unit id="javaewah" version="1.1.13.v20211029-0839"/>
 +      <unit id="javaewah.source" version="1.1.13.v20211029-0839"/>
 +      <unit id="net.bytebuddy.byte-buddy" 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="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
 +      <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20210923-1401"/>
 +      <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20210923-1401"/>
 +      <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/>
 +      <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
 +      <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
 +      <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
 +      <unit id="org.apache.commons.compress" version="1.21.0.v20211103-2100"/>
 +      <unit id="org.apache.commons.compress.source" version="1.21.0.v20211103-2100"/>
 +      <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.13.v20210128-2225"/>
 +      <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/>
 +      <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
 +      <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
 +      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
 +      <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
 +      <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
 +      <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
 +      <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
 +      <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
 +      <unit id="org.assertj" version="3.20.2.v20210706-1104"/>
 +      <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
 +      <unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
 +      <unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
 +      <unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
 +      <unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
 +      <unit id="org.bouncycastle.bcprov" version="1.69.0.v20210923-1401"/>
 +      <unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210923-1401"/>
 +      <unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
 +      <unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
 +      <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
 +      <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
 +      <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="org.junit" version="4.13.2.v20211018-1956"/>
 +      <unit id="org.junit.source" version="4.13.2.v20211018-1956"/>
 +      <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.mockito" version="2.23.0.v20200310-1642"/>
 +      <unit id="org.mockito.source" version="2.23.0.v20200310-1642"/>
 +      <unit id="org.objenesis" version="2.6.0.v20180420-1519"/>
 +      <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
 +      <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
 +      <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
 +      <unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
 +      <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
 +      <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
 +      <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
 +      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211122181901/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/2021-12/"/>
 +    </location>
 +  </locations>
 +</target>

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