Merge branch 'master' into next

* master: (34 commits)
  Remove texts which were added by mistake in 00386272
  Fix formatting which was broken in 00386272
  LockFile: create OutputStream only when needed
  Add a cgit interoperability test for LockFile
  Add TemporaryBuffer.toString(int limit)
  LockFile: create OutputStream only when needed
  Prepare 5.12.0-SNAPSHOT builds
  JGit v5.12.0.202105051250-m2
  Update jetty to 9.4.40.v20210413
  [releng] Update eclipse-jarsigner-plugin to 1.3.1
  Implement ours/theirs content conflict resolution
  ssh: ensure list is modifiable before using Iterator.remove().
  Update orbit to S20210406213021 and add 4.20-staging target
  Fix typo in test method name
  Allow file mode conflicts in virtual base commit on recursive merge.
  sshd: don't lock the known_hosts files on reading
  Allow info messages in UsernamePasswordCredentialsProvider
  ssh config: do environment variable replacement
  sshd: implement server-sig-algs SSH extension (client side)
  Upgrade ecj to 3.25.0
  ...

Change-Id: Ibc39a9c4e431d15b67ab4a307241f47a7f3740a9

1 files changed, 21 insertions, 21 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 192671249e..21a6e1f184 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,28 +1,28 @@
 <?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="1615333055">
+<target name="jgit-4.11" sequenceNumber="1619186290">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.36.v20210114"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.36.v20210114"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.36.v20210114"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.36.v20210114"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.36.v20210114"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.36.v20210114"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.36.v20210114"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.36.v20210114"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.36.v20210114"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.36.v20210114"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.36.v20210114"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.36.v20210114"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.36.v20210114"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.36.v20210114"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.36.v20210114"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.36.v20210114"/>
-      <unit id="org.eclipse.jetty.util.ajax" version="9.4.36.v20210114"/>
-      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.36.v20210114"/>
-      <repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.36.v20210114/"/>
+      <unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.4.40.v20210413"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.4.40.v20210413"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.4.40.v20210413"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.40.v20210413"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.4.40.v20210413"/>
+      <unit id="org.eclipse.jetty.io" version="9.4.40.v20210413"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.4.40.v20210413"/>
+      <unit id="org.eclipse.jetty.security" version="9.4.40.v20210413"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.4.40.v20210413"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.40.v20210413"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.40.v20210413"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.40.v20210413"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.4.40.v20210413"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.40.v20210413"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/>
+      <unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/>
+      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/>
+      <repository id="jetty-9.4.36" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
@@ -86,7 +86,7 @@
       <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/R20210223232630/repository"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210406213021/repository"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.osgi" version="0.0.0"/>