Merge branch 'master' into stable-6.0

* master:
  Add 4.22 target platform for 2021-12
  Update Orbit to R20211122181901 for 2021-12
  AppServer: fix keystore used to setup test SSL context factory
  [6.0 API cleanup] Public interface for PackLock
  [6.0 API cleanup] StoredObjectRepresentationNotAvailableException
  RepoCommand: Do not wrap GitApiExceptions in GitApiExceptions
  Set JSch global config values only if not set already
  Better git system config finding
  [6.0 API cleanup] CancelledException vs. CanceledException
  Javadoc fixes
  Better git system config finding
  HttpClientConnectionTest: organize imports
  Update Jetty to 10.0.6
  Fix missing @since 6.0 tag
  Support commit.template config property
  DFS block cache: harden against race over ref locks.

Change-Id: Id9814d92eb40b2ba63c5e753a86a4809826e7c81

1 files changed, 19 insertions, 23 deletions

diff --git a/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
index 5f44987235..1b6cf26a5e 100644
--- a/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,28 +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.21" sequenceNumber="1636551936">
+<target name="jgit-4.21" sequenceNumber="1637746569">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.util.ajax" version="9.4.44.v20210927"/>
-      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.44.v20210927"/>
-      <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.44.v20210927/"/>
+      <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"/>
@@ -37,8 +35,6 @@
       <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="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"/>
       <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"/>
@@ -93,7 +89,7 @@
       <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/S20211108222137/repository"/>
+      <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"/>