Merge branch 'master' into next

* master: (38 commits)
  Revert "DFS block cache: Refactor to enable parallel index loading"
  GitServlet: allow to override default error handlers
  Silence API error for new interface method ProtocolV2Hook#onObjectInfo
  transport: add object-info capability
  Ignore IllegalStateException if JVM is already shutting down
  Update orbit to R20210825222808 for 2021-09
  Update spotbugs-maven-plugin to 4.3.0
  Update ant to 1.10.11 also in pom.xml
  DFS block cache: add additional stats to DfsReaderIoStats
  Update Orbit to S20210817231813
  [gpg] Better GPG home directory determination
  FS: cleanup use of final modifier
  Ensure FS#searchPath only selects executable files
  RevWalk: getMergedInto's result is wrong on the second call
  DFS block cache: Refactor to enable parallel index loading
  [test] Create keystore with the keytool of the running JDK
  [gpg] Update to Bouncy Castle 1.69
  [test] Create keystore with the keytool of the running JDK
  [sshd] Minor code clean-up
  Support commit.template config property
  ...

Change-Id: I9f99e9a513a23c0c0d252334e79c351512d7355e

1 files changed, 47 insertions, 44 deletions

diff --git a/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
index 43831780c6..55454cccab 100644
--- a/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,38 +1,38 @@
 <?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="1623856144">
+<target name="jgit-4.11" sequenceNumber="1630003272">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.42.v20210604"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.42.v20210604"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.42.v20210604"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.42.v20210604"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.42.v20210604"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.42.v20210604"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.42.v20210604"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.42.v20210604"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.42.v20210604"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.42.v20210604"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.42.v20210604"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.42.v20210604"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.42.v20210604"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.42.v20210604"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.42.v20210604"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.42.v20210604"/>
-      <unit id="org.eclipse.jetty.util.ajax" version="9.4.42.v20210604"/>
-      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.42.v20210604"/>
-      <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.42.v20210604/"/>
+      <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://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
-      <unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
+      <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.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="javaewah" version="1.1.7.v20200107-0831"/>
-      <unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
+      <unit id="javaewah" version="1.1.12.v20210622-2206"/>
+      <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
       <unit id="javax.servlet" version="3.1.0.v201410161800"/>
       <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
@@ -41,12 +41,12 @@
       <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
       <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.ant" version="1.10.10.v20210426-1926"/>
-      <unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
+      <unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
+      <unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
       <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.19.0.v20200106-2343"/>
-      <unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
+      <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+      <unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
       <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"/>
@@ -55,19 +55,22 @@
       <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.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.assertj" version="3.14.0.v20200120-1926"/>
-      <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
-      <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
-      <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <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.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
+      <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"/>
@@ -84,9 +87,9 @@
       <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.8.0.v20180207-1613"/>
-      <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+      <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/R20210825222808/repository"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.osgi" version="0.0.0"/>