Merge branch 'master' into stable-6.0

* master: Update documentation for 6.0 Add 4.22 target platform for 2021-12 Update Orbit to R20211122181901 for 2021-12 GitCloneWizardTestBase: ignore errors during cleanup Temporarily ignore GitCloneWizardHttpsTest Adapt to changes in JGit Change-Id: I0ffd1f7f446db6d89470da8b5d34a7be087a3ab4
author: Matthias Sohn 2021-11-24 16:50:53 +0000
committer: Matthias Sohn 2021-11-24 16:50:53 +0000
commit: 7b81c171d4f155925a4c236c7d1670030cc14013 (patch)
tree: a7e7a8b0f3cf99aa117c6e39a115e6576a2af198
parent: 46db8108d7437ec492ae7ca953850299d465619c (diff)
parent: 5ea0d9251efed90cf84236940ed666fbffa0f510 (diff)
download: egit-7b81c171d4f155925a4c236c7d1670030cc14013.tar.gz
egit-7b81c171d4f155925a4c236c7d1670030cc14013.tar.xz
egit-7b81c171d4f155925a4c236c7d1670030cc14013.zip
44 files changed, 656 insertions, 419 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CompareCoreUtils.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CompareCoreUtils.java
index 8300ca4ed1..3e1a310ffd 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CompareCoreUtils.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CompareCoreUtils.java
@@ -27,10 +27,10 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.egit.core.internal.util.ResourceUtil;
 import org.eclipse.jgit.annotations.NonNull;
 import org.eclipse.jgit.annotations.Nullable;
+import org.eclipse.jgit.api.errors.CanceledException;
 import org.eclipse.jgit.diff.DiffEntry;
 import org.eclipse.jgit.diff.DiffEntry.ChangeType;
 import org.eclipse.jgit.diff.RenameDetector;
-import org.eclipse.jgit.errors.CancelledException;
 import org.eclipse.jgit.lib.NullProgressMonitor;
 import org.eclipse.jgit.lib.ObjectReader;
 import org.eclipse.jgit.lib.Repository;
@@ -146,7 +146,7 @@ public class CompareCoreUtils {
 			try {
 				renames = detector.compute(walk.getObjectReader(),
 						NullProgressMonitor.INSTANCE);
-			} catch (CancelledException e) {
+			} catch (CanceledException e) {
 				return null;
 			}
 			for (DiffEntry diff : renames) {
diff --git a/org.eclipse.egit.doc/build-help.xml b/org.eclipse.egit.doc/build-help.xml
index c6ec117525..a1e76dda92 100644
--- a/org.eclipse.egit.doc/build-help.xml
+++ b/org.eclipse.egit.doc/build-help.xml
@@ -45,8 +45,8 @@
 			>
 				<path name="EGit/User_Guide" title="EGit User Guide" />
 				<path name="JGit/User_Guide" title="JGit User Guide" />
-				<path name="EGit/New_and_Noteworthy/5.13" title="EGit 5.13 New and Noteworthy" />
-				<path name="JGit/New_and_Noteworthy/5.13" title="JGit 5.13 New and Noteworthy" />
+				<path name="EGit/New_and_Noteworthy/6.0" title="EGit 6.0 New and Noteworthy" />
+				<path name="JGit/New_and_Noteworthy/6.0" title="JGit 6.0 New and Noteworthy" />
 				<path name="EGit/Git_For_Eclipse_Users" title="Git for Eclipse Users" />
 				<path name="EGit/Contributor_Guide" title="EGit Contributor Guide" />
 				<stylesheet url="book.css" />
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html
index f4fb70dd97..ec3a5df6f5 100644
--- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html
@@ -41,9 +41,7 @@
 		</ul>
 		<p>Prerequisites for the Maven build are</p>
 		<ul>
-			<li>Java 8, updating JGit to Java 11 is 
-				<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=569917" target="egit_external">planned for 6.0</a>
-			</li>
+			<li>since 6.0 Java 11, older versions need Java 8 </li>
 			<li>
 				<a href="https://maven.apache.org/download.html" target="egit_external">at least Maven 3.5.2</a>
 			</li>
@@ -57,7 +55,7 @@
 		<h2 id="JGit_2">JGit</h2>
 		<ul>
 			<li>JGit can be built using Maven or Bazel</li>
-			<li>use Java 8 to run the JGit build</li>
+			<li>use Java 11 to run the JGit build</li>
 			<li>JGit packaging projects (Eclipse features and p2 repository) are built using Maven and Tycho.</li>
 		</ul>
 		<h2 id="EGit_2">EGit</h2>
@@ -76,7 +74,7 @@
 		</ul>
 		<h2 id="Maven_Build">Maven Build</h2>
 		<p>To build JGit or EGit versions &lt;= 5.12.0 maven must be run using Java 1.8. Ensure that environment variable <tt>JAVA_HOME</tt> points to a Java 1.8 installation.</p>
-		<p>EGit versions &gt;= 5.12.1 can be built with any Java &gt;= 1.8, but the build uses 
+		<p>EGit versions &gt;= 5.12.1 and &lt; 6.0.0 can be built with any Java &gt;= 1.8, but the build uses 
 			<a href="https://maven.apache.org/guides/mini/guide-using-toolchains.html" target="egit_external">maven toolchain</a> definitions. To run a local EGit build for these versions (including the 'master' branch, i.e. EGit nightly), you need to have a local file <tt>
 			<b>~/.m2/toolchains.xml</b></tt> providing at least a JDK toolchain definition for "JavaSE-1.8":
 		</p>
@@ -106,8 +104,9 @@
 &lt;/toolchains&gt;
 </pre>
 		<p>The <tt>jdkHome</tt> directory is the one that contains the <tt>bin</tt> directory in which there is the <tt>java</tt> executable.</p>
-		<p>If you can, include already a definition for a Java 11 toolchain as shown above. EGit and JGit may require a minimum of Java 11 in the not-too-distant future.</p>
-		<p>Building JGit with maven currently requires running maven with Java 1.8 in all cases.</p>
+		<p>Also include a definition for a Java 11 toolchain as shown above: EGit versions &gt;= 6.0.0 require at least Java 11 to build, and require a Java 11 toolchain definition for running the tests.</p>
+		<p>Building JGit versions &lt; 6.0.0 with maven requires running maven with Java 1.8 in all cases.</p>
+		<p>Building JGit versions &gt;= 6.0.0 with maven requires running maven and compiling with at least Java 11.</p>
 		<ul>
 			<li>Due to a 
 				<a href="https://wiki.eclipse.org/Tycho/How_Tos/Dependency_on_pom-first_artifacts" target="egit_external">limitation of Tycho</a> it is not possible to mix pom-first and manifest-first builds in the same reactor build hence the pom-first JGit build has to run separately before the build for the manifest-first JGit packaging project.
@@ -116,6 +115,9 @@
 			<li>To run the build behind a firewall follow 
 				<a href="https://maven.apache.org/guides/mini/guide-proxies.html" target="egit_external">https://maven.apache.org/guides/mini/guide-proxies.html</a> 
 			</li>
+			<li>To run the JGit maven build on a 
+				<i>case-insensitive</i> file system, you might need to suppress javadoc generation if you get an error "class IO clashes with package of same name". Use "<tt>mvn clean install -Dmaven.javadoc.skip=true</tt>" instead of plain "<tt>mvn clean install</tt>".
+			</li>
 		</ul>
 		<p>Complete build sequence for a clean build (assuming $M2_HOME/bin is on the path and local Maven repository at ~/.m2/repository):</p>
 		<pre style="width: 55em;">
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Manual-Developer-Setup.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Manual-Developer-Setup.html
index d847ca05b3..ea3cb8a3ea 100644
--- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Manual-Developer-Setup.html
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Manual-Developer-Setup.html
@@ -83,16 +83,6 @@ git clone &lt;enter URL&gt;
 			<a href="https://git.eclipse.org/c/egit/egit-github.git/plain/org.eclipse.mylyn.github-feature/github.target" target="egit_external">view on web</a>) and select 
 			<i>Set as Target Platfrom</i>.
 		</p>
-		<h4 id="EGit_PDE_Tools">EGit PDE Tools</h4>
-		<p>URL: 
-			<a href="https://git.eclipse.org/r/egit/egit-pde.git" target="egit_external">https://git.eclipse.org/r/egit/egit-pde.git</a>
-		</p>
-		<p>EGit also provides tools for integrating with 
-			<a href="https://wiki.eclipse.org/PDE/Build" title="PDE/Build" target="egit_external">PDE Build</a> and Eclipse RelEng Tools. If you are an Eclipse developer using PDE Build and/or the Eclipse RelEng tools you might be interesting in the following as well. Otherwise you might just skip this section. 
-		</p>
-		<p>In addition to the 
-			<a href="#Dependencies">dependencies</a> required for JGit and EGit you also need Eclipse PDE (&gt;= 3.6.1) as well as <code>org.eclipse.releng.tools</code> in your target platform or checked out from Git in your workspaces.
-		</p>
 		<h2 id="Development_IDE_Configuration">Development IDE Configuration</h2>
 		<p>Download and install the Eclipse package "Eclipse IDE for Eclipse Committers" or "Eclipse for RCP and RAP Developers" from here, if you don't already have it:</p>
 		<p>
@@ -118,13 +108,13 @@ git clone &lt;enter URL&gt;
 			<li>Restart</li>
 		</ul>
 		<h3 id="Java_Requirements">Java Requirements</h3>
-		<p>EGit and JGit have Java 8.0 and 
-			<a href="https://wiki.eclipse.org/EGit/FAQ#What_versions_of_Eclipse_does_EGit_target.3F" target="egit_external">Eclipse Platform 4.6 (Neon)</a> as minimum requirements, so dependencies to newer Java and platform versions must be avoided.
+		<p>Since 6.0 EGit and JGit have Java 11 and 
+			<a href="https://wiki.eclipse.org/EGit/FAQ#What_versions_of_Eclipse_does_EGit_target.3F" target="egit_external">Eclipse Platform 4.17 (2020-09)</a> as minimum requirements, so dependencies to newer Java and platform versions must be avoided.
 		</p>
 		<p>We are using 
 			<i>API Tools Environment Descriptions</i> (see changes for 
 			<a href="https://git.eclipse.org/r/#/c/4785/" target="egit_external">JGit</a> and 
-			<a href="https://git.eclipse.org/r/#/c/4365/" target="egit_external">EGit</a>) to facilitate detecting code which isn't working on Java 8. If you followed the instructions in the 
+			<a href="https://git.eclipse.org/r/#/c/4365/" target="egit_external">EGit</a>) to facilitate detecting code which isn't working on Java 11. If you followed the instructions in the 
 			<i>Tools</i> section above, the necessary descriptions should already be installed. Otherwise install 
 			<i>API Tools Environment Descriptions</i> from the release train repository, see 
 			<a href="https://wiki.eclipse.org/Execution_Environments#Installing_Execution_Environment_Descriptions" title="Execution_Environments#Installing_Execution_Environment_Descriptions" target="egit_external">Installing Execution Environment Descriptions</a>.
@@ -140,7 +130,7 @@ git clone &lt;enter URL&gt;
 				<i>org.eclipse.egit.target</i> project
 			</li>
 			<li>Choose the 
-				<i>egit-&lt;version&gt;.target</i> file matching the version of your Eclipse platform (e.g. 4.5 for Mars) and open it (this may take a while as it downloads the indexes of the p2 repositories the target platform refers to)
+				<i>egit-&lt;version&gt;.target</i> file matching the version of your Eclipse platform (e.g. 4.21 for 2021-09) and open it (this may take a while as it downloads the indexes of the p2 repositories the target platform refers to)
 			</li>
 			<li>In the resulting editor, click on the 
 				<i>Set as Target Platform</i> link at the top right (this may also take a while since it downloads the dependencies)
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/5.13.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/5.13.html
deleted file mode 100644
index 7a729eb2f7..0000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/5.13.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-		<title>EGit 5.13 New and Noteworthy</title>
-		<link type="text/css" rel="stylesheet" href="../../../book.css"/>
-	</head>
-	<body>
-		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
-			<tr>
-				<th style="width: 100%" align="center" colspan="3">EGit 5.13 New and Noteworthy</th>
-			</tr>
-			<tr>
-				<td style="width: 20%" align="left"></td>
-				<td style="width: 60%" align="center"></td>
-				<td style="width: 20%" align="right">
-					<a href="Contributors.html" title="Contributors">
-						<img alt="Next" border="0" src="../../../images/next.gif"/>
-					</a>
-				</td>
-			</tr>
-			<tr>
-				<td style="width: 20%" align="left" valign="top"></td>
-				<td style="width: 60%" align="center"></td>
-				<td style="width: 20%" align="right" valign="top">Contributors</td>
-			</tr>
-		</table><hr class="navigation-separator"/>
-		<h1 id="EGit">EGit</h1>
-		<h2 id="Blame">Blame</h2>
-		<p>Git blame information shown in an editor open on a file from the git working tree of a git repository is updated now whenever the HEAD of that repository changes, for instance, when a new branch is checked out, or when the currently shown file is edited, saved, and then committed. The git blame information can be switched on via the 
-			<i>Show Revision Information</i> command available in the context menu of the editor.
-		</p>
-		<h2 id="Comparisons">Comparisons</h2>
-		<p>EGit 5.13 brings some improvements in the compare editor of Eclipse, and some new commands to compare commits against the working tree.</p>
-		<h3 id="Compare_Editor">Compare Editor</h3>
-		<p>When a comparison is opened on several files, the Compare Editor of Eclipse shows a directory view at the top. EGit 5.13 customizes this view to show a compact tree in which a single folder node is shown for a whole folder hierarchy when there is nothing interesting to show for intermediary folders:</p>
-		<p>
-			<img alt="&quot;The Compare Editor&apos;s directory viewer showing a compact tree&quot;" border="0" src="images/EGit_5.13_Compare_Compact_Tree.png"/>
-		</p>
-		<p>This directory viewer in the Eclipse Compare Editor is typically fairly small (the user can enlarge it, though), and a compact tree is in many cases easier to navigate.</p>
-		<p>In addition, the view gets a toolbar with operations to expand or collapse all directories shown in the view. The context menu has an 
-			<i>Expand All</i> command that fully expands only the selected folders.
-		</p>
-		<p>EGit 5.13 also customizes the view's context menu.</p>
-		<p>
-			<img alt="&quot;The customized context menu in the Compare Editor&apos;s directory viewer showing the &apos;Show In&apos; command&quot;" border="0" src="images/EGit_5.13_Compare_Show_In_Menu.png"/>
-		</p>
-		<p>Newly, the 
-			<i>Show In</i> sub-menu is also available in this context menu in the Commit Editor. It can be used to show the selected items in other views.
-		</p>
-		<p>Additionally, there is a new 
-			<i>Compare with Each Other</i> command that is active when exactly two files are selected in the directory viewer. It opens a comparison between the two selected files.
-		</p>
-		<p>
-			<img alt="&quot;The &apos;Compare With Each Other&apos; command in the context menu of the Compare Editor&apos;s directory viewer&quot;" border="0" src="images/EGit_5.13_Compare_With_Each_Other.png"/>
-		</p>
-		<p>This is especially useful when files have been renamed, but the Compare Editor shows them as one file having been added and the other having been deleted. To get a comparison of the renamed file, select the added and the deleted file and choose 
-			<i>Compare with Each Other</i>.
-		</p>
-		<h3 id="New_Comparison_Commands">New Comparison Commands</h3>
-		<p>In the Git Repositories View, there's a new command to compare a branch, tag, or other reference directly with the working tree.</p>
-		<p>
-			<img alt="&quot;The &apos;Compare With Working Tree&apos; command in the context menu of the Git Repositories View&quot;" border="0" src="images/EGit_5.13_Compare_Branch_with_Working_Tree.png"/>
-		</p>
-		<p>Conversely, when files or directories are selected in the Git Repositories View, there's a new sub-menu 
-			<i>Compare With</i> to compare the working tree against an arbitrary branch, tag, or commit.
-		</p>
-		<p>
-			<img alt="&quot;The &apos;Compare With&apos; sub-menu in the Git Repositories View&quot;" border="0" src="images/EGit_5.13_Compare_With.png"/>
-		</p>
-		<p>Finally, 
-			<i>Compare With Working Tree</i> is now also enabled in the Git History View when several files are selected. Previously this command was enabled only when a single file was selected.
-		</p>
-		<p>
-			<img alt="&quot;&apos;Compare With Working Tree&apos; in the Git History View enabled for multi-file selections&quot;" border="0" src="images/EGit_5.13_History_Compare_with_Working_Tree.png"/>
-		</p>
-		<h2 id="API">API</h2>
-		<p>EGit 5.13 adds new API in the <code>org.eclipse.egit.core</code> bundle to give access to its credentials store. EGit by default uses the Eclipse Secure Storage to store log-in credentials such as user names and passwords (or in the case of Github, personal access tokens (PATs)) or passphrases for encrypted SSH keys. Newly, this credentials store is accessible and even customizeable via the 
-			<a href="https://docs.osgi.org/specification/osgi.cmpn/7.0.0/service.component.html" target="egit_external">OSGi service</a> mechanism. The implementation has been split into a storage back-end service and a UI service, and EGit provides default service implementations for both with the default service ranking. Third-party code can install its own implementations by providing services with a higher ranking.
-		</p>
-		<p>There are two new OSGi service interfaces in bundle <code>org.eclipse.egit.core</code>:</p>
-		<ul>
-			<li><code>org.eclipse.egit.core.credentials.CredentialsStore</code> is the service interface for the storage back-end. EGit Core provides a default service implementation based on the Eclipse Secure Storage.</li>
-			<li><code>org.eclipse.egit.core.credentials.CredentialsUI</code> is the UI service interface. EGit UI (bundle <code>org.eclipse.egit.ui</code>) provides a default service implementation, prompting the user for passwords or passphrases via dialogs.</li>
-		</ul>
-		<h2 id="Other_Changes">Other Changes</h2>
-		<p>EGit 5.13 includes some less noticeable improvements in the UI, plus a number of bug fixes. The complete list of new features and bug fixes is available in the 
-			<a href="https://projects.eclipse.org/projects/technology.egit/releases/5.13.0/" target="egit_external">release notes</a>.
-		</p><hr class="navigation-separator"/>
-		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
-			<tr>
-				<td style="width: 20%" align="left"></td>
-				<td style="width: 60%" align="center"></td>
-				<td style="width: 20%" align="right">
-					<a href="Contributors.html" title="Contributors">
-						<img alt="Next" border="0" src="../../../images/next.gif"/>
-					</a>
-				</td>
-			</tr>
-			<tr>
-				<td style="width: 20%" align="left" valign="top"></td>
-				<td style="width: 60%" align="center"></td>
-				<td style="width: 20%" align="right" valign="top">Contributors</td>
-			</tr>
-		</table>
-	</body>
-</html>
-\ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/images/EGit_5.13_Compare_Branch_with_Working_Tree.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/images/EGit_5.13_Compare_Branch_with_Working_Tree.png
deleted file mode 100644
index 65f1b93c34..0000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/images/EGit_5.13_Compare_Branch_with_Working_Tree.png
+++ /dev/null
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/images/EGit_5.13_Compare_Compact_Tree.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/images/EGit_5.13_Compare_Compact_Tree.png
deleted file mode 100644
index c42d1779a4..0000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/images/EGit_5.13_Compare_Compact_Tree.png
+++ /dev/null
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/images/EGit_5.13_Compare_Show_In_Menu.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/images/EGit_5.13_Compare_Show_In_Menu.png
deleted file mode 100644
index 97d07d5e35..0000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/images/EGit_5.13_Compare_Show_In_Menu.png
+++ /dev/null
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/images/EGit_5.13_Compare_With.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/images/EGit_5.13_Compare_With.png
deleted file mode 100644
index e77b4856ee..0000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/images/EGit_5.13_Compare_With.png
+++ /dev/null
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/images/EGit_5.13_Compare_With_Each_Other.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/images/EGit_5.13_Compare_With_Each_Other.png
deleted file mode 100644
index 1d8479486a..0000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/images/EGit_5.13_Compare_With_Each_Other.png
+++ /dev/null
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/images/EGit_5.13_History_Compare_with_Working_Tree.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/images/EGit_5.13_History_Compare_with_Working_Tree.png
deleted file mode 100644
index d2b545407d..0000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/images/EGit_5.13_History_Compare_with_Working_Tree.png
+++ /dev/null
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.0/6.0.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.0/6.0.html
new file mode 100644
index 0000000000..8d9088f284
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.0/6.0.html
@@ -0,0 +1,133 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>EGit 6.0 New and Noteworthy</title>
+		<link type="text/css" rel="stylesheet" href="../../../book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">EGit 6.0 New and Noteworthy</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Contributors.html" title="Contributors">
+						<img alt="Next" border="0" src="../../../images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Contributors</td>
+			</tr>
+		</table><hr class="navigation-separator"/>
+		<h1 id="EGit">EGit</h1>
+		<h2 id="Prerequisites">Prerequisites</h2>
+		<p>EGit 6.0 
+			<b>requires Java 11</b> to run. Previous versions required a minimum of Java 1.8.
+		</p>
+		<p>The 
+			<b>minimum Eclipse platform</b> for EGit 6.0 is 
+			<b>Eclipse 2020-09 (4.17)</b>. While previous versions could be installed on any Eclipse since Neon.3, EGit 6.0 will not install on Eclipse platforms older than Eclipse 2020-09. (Eclipse 2020-09 was the first Eclipse version that also required Java 11 to run.)
+		</p>
+		<p>The last EGit version that uses Java 1.8 and that can be installed on Eclipse platforms as old as Neon.3 is EGit 5.13. There will be no new features in the EGit 5.x series.</p>
+		<h2 id="Fetching_Pull_Requests">Fetching Pull Requests</h2>
+		<p>EGit 6.0 has a new feature to fetch pull requests from Github or Gitlab. If a local repository has a 
+			<a href="https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes" target="egit_external">remote</a> pointing to Github or Gitlab, there are new commands 
+			<i>Fetch Github Pull Request...</i> or 
+			<i>Fetch Gitlab Merge Request...</i> in the context menus:
+		</p>
+		<p>
+			<img alt="&quot;Screenshot showing the new commands in the context menu of the Git Repositories view&quot;" border="0" src="images/EGit_6.0_Fetch_PR_RepoView.png"/>
+		</p>
+		<p>The command is also available in the 
+			<i>Team&rarr;Remote</i> sub-menu of the context menu in other views, for instance in the Package Explorer on Eclipse projects from a git repository managed by EGit.
+		</p>
+		<p>The command opens a dialog to fetch a pull request (called "merge request" on Gitlab). Enter the pull request 
+			<i>number</i>, then choose what to do after having fetched it. By default, EGit proposes to create a new local branch for the pull request and then to check out that branch. The input field for the pull request number has content assist showing a list of all available pull requests.
+		</p>
+		<p>
+			<img alt="&quot;Screenshot of the dialog for fetching pull requests&quot;" border="0" src="images/EGit_6.0_Fetch_PR_Dialog.png"/>
+		</p>
+		<p>If the user copied a pull request number or the web URL of a pull request before opening the dialog, the dialog automatically fills in that pull request number from the clipboard. So a simple workflow to fetch a pull request is:</p>
+		<ol>
+			<li>On the Github or Gitlab web page for the pull request and copy the URL of the page from the browser's address bar, or copy the pull request number shown on the web page.</li>
+			<li>In Eclipse, choose 
+				<i>Fetch Github Pull Request...</i> or 
+				<i>Fetch Gitlab Merge Request...</i>.
+			</li>
+			<li>Click the "Finish" button (or hit the &lt;return&gt; key).</li>
+		</ol>
+		<p>Opening the dialog first, then copying the pull request number or web URL and pasting it into the dialog's input field also works.</p>
+		<h3 id="Configuring_Hosts_for_Pull_Requests">Configuring Hosts for Pull Requests</h3>
+		<p>EGit uses the normal git mechanisms for fetching pull requests; it does 
+			<i>not</i> use the REST APIs Github or Gitlab offer. It cannot know automatically whether a particular remote refers to a Github or Gitlab host: there is no API in the git protocols to detect what kind of server one connects to. EGit needs to know because the two kinds of servers publish pull requests slightly differently.
+		</p>
+		<p>EGit thus uses simple host name pattern matching. If the host name in a remote URI is "github.com", it's a Github server, and the 
+			<i>Fetch Github Pull Request...</i> command is available. If the host name is "gitlab.com" or "gitlab.somedomain.com" or "gitlab.somedomain.org", it's a Gitlab server, and the 
+			<i>Fetch Gitlab Merge Request...</i> command is available.
+		</p>
+		<p>To support private installations of GitHub Enterprise or Gitlab EE instances at arbitrary host names, users can define additional host name patterns at a new preference page at 
+			<i>Preferences&rarr;Version Control&rarr;Git&rarr;Servers</i>:
+		</p>
+		<p>
+			<img alt="&quot;Screenshot of the preference page for entering host name patterns&quot;" border="0" src="images/EGit_6.0_Server_Preferences.png"/>
+		</p>
+		<p>On this preference page one can define host name patterns and associate them with a git server type ("Github" or "Gitlab"). The fields in the table are editable. Patterns are Java regular expressions matching host names; during editing content assist giving hints about the regular expression syntax is available.</p>
+		<dl>
+			<dd>For Github, users also have the option to install the 
+				<a href="https://www.eclipse.org/egit/download/" target="egit_external">GitHub Mylyn connector</a>, which uses the Github REST API and which provides a different and richer UI. With the Github Mylyn connector, define a "task repository" of type Github/Pull Requests and create a query for open PRs. To fetch a pull request, open it from the Mylyn Tasks view, then click the "Fetch commits from PR" icon top right in the PR editor.
+			</dd>
+		</dl>
+		<h2 id="SSH_Agent">SSH Agent</h2>
+		<p>EGit 6.0 uses an SSH2 agent, if one is running, in SSH public-key authentication. On Windows, EGit supports Pageant, the SSH agent of PuTTY; on other operating systems it uses a Unix domain socket given via environment variable 
+			<b><tt>SSH_AUTH_SOCK</tt></b>, which is the normal mechanism used e.g. by the OpenSSH agent.
+		</p>
+		<p>Use of an SSH agent can be switched on or off globally in EGit 6.0 via a new preference:</p>
+		<p>
+			<img alt="&quot;Screenshot of the Egit preferences with the new option for enabling or disabling ussing an SSH agent&quot;" border="0" src="images/EGit_6.0_SSH_agent_Preference.png"/>
+		</p>
+		<p>By default, this setting is 
+			<i>switched on</i>.
+		</p>
+		<p>The EGit feature is completely independent of the agent settings in 
+			<i>Preferences&rarr;Global&rarr;Network Connections&rarr;SSH2</i>.
+		</p>
+		<h3 id="Limitations">Limitations</h3>
+		<p>Some directives in the <tt>~/.ssh/config</tt> file are not handled yet:</p>
+		<ul>
+			<li><tt>IdentityAgent</tt></li>
+			<li><tt>AddKeysToAgent</tt></li>
+			<li><tt>SecurityKeyProvider</tt></li>
+		</ul>
+		<p>Support for these is planned for a future version as it needs upstream changes in the Apache MINA sshd library used by EGit and JGit for SSH communication.</p>
+		<p>Integration with a native keychain (the <tt>UseKeychain</tt> directive on Mac) is not supported.</p>
+		<p>EGit does 
+			<i>not</i> do agent forwarding. Use the <tt>ProxyJump</tt> directive in <tt>~/.ssh/config</tt> instead.
+		</p>
+		<h2 id="Other_Changes">Other Changes</h2>
+		<p>EGit 6.0 includes some less noticeable improvements in the UI, plus a number of bug fixes. The complete list of new features and bug fixes is available in the 
+			<a href="https://projects.eclipse.org/projects/technology.egit/releases/6.0/" target="egit_external">release notes</a>.
+		</p><hr class="navigation-separator"/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Contributors.html" title="Contributors">
+						<img alt="Next" border="0" src="../../../images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Contributors</td>
+			</tr>
+		</table>
+	</body>
+</html>
+\ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/Contributors.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.0/Contributors.html
index a2fb927d97..258b28390c 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/Contributors.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.0/Contributors.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-		<title>EGit 5.13 New and Noteworthy - Contributors</title>
+		<title>EGit 6.0 New and Noteworthy - Contributors</title>
 		<link type="text/css" rel="stylesheet" href="../../../book.css"/>
 	</head>
 	<body>
@@ -12,7 +12,7 @@
 			</tr>
 			<tr>
 				<td style="width: 20%" align="left">
-					<a href="5.13.html" title="EGit 5.13 New and Noteworthy">
+					<a href="6.0.html" title="EGit 6.0 New and Noteworthy">
 						<img alt="Previous" border="0" src="../../../images/prev.gif"/>
 					</a>
 				</td>
@@ -24,28 +24,25 @@
 				</td>
 			</tr>
 			<tr>
-				<td style="width: 20%" align="left" valign="top">EGit 5.13 New and Noteworthy</td>
+				<td style="width: 20%" align="left" valign="top">EGit 6.0 New and Noteworthy</td>
 				<td style="width: 60%" align="center"></td>
 				<td style="width: 20%" align="right" valign="top">See Also</td>
 			</tr>
 		</table><hr class="navigation-separator"/>
 		<h1 id="Contributors">Contributors</h1>
-		<p>The following 5 developers worked on this release:</p>
-		<p>Andrey Loskutov,
-			Matthias Sohn,
-			Max Hohenegger,
-			Mickael Istria,
+		<p>The following 2 developers worked on this release:</p>
+		<p>Matthias Sohn,
 			Thomas Wolf</p><hr class="navigation-separator"/>
 		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
 			<tr>
 				<td style="width: 20%" align="left">
-					<a href="5.13.html" title="EGit 5.13 New and Noteworthy">
+					<a href="6.0.html" title="EGit 6.0 New and Noteworthy">
 						<img alt="Previous" border="0" src="../../../images/prev.gif"/>
 					</a>
 				</td>
 				<td style="width: 60%" align="center">
-					<a href="5.13.html" title="EGit 5.13 New and Noteworthy">
-						<img alt="EGit 5.13 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+					<a href="6.0.html" title="EGit 6.0 New and Noteworthy">
+						<img alt="EGit 6.0 New and Noteworthy" border="0" src="../../../images/home.gif"/>
 					</a>
 				</td>
 				<td style="width: 20%" align="right">
@@ -55,7 +52,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td style="width: 20%" align="left" valign="top">EGit 5.13 New and Noteworthy</td>
+				<td style="width: 20%" align="left" valign="top">EGit 6.0 New and Noteworthy</td>
 				<td style="width: 60%" align="center"></td>
 				<td style="width: 20%" align="right" valign="top">See Also</td>
 			</tr>
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/See-Also.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.0/See-Also.html
index 29c7f7c7dc..418659dc70 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/See-Also.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.0/See-Also.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-		<title>EGit 5.13 New and Noteworthy - See Also</title>
+		<title>EGit 6.0 New and Noteworthy - See Also</title>
 		<link type="text/css" rel="stylesheet" href="../../../book.css"/>
 	</head>
 	<body>
@@ -31,7 +31,7 @@
 		</table><hr class="navigation-separator"/>
 		<h1 id="See_Also">See Also</h1>
 		<p>See also the 
-			<a href="../../../JGit/New_and_Noteworthy/5.13/5.13.html" title="JGit/New_and_Noteworthy/5.13">new features in JGit</a> for additional information.
+			<a href="../../../JGit/New_and_Noteworthy/6.0/6.0.html" title="JGit/New_and_Noteworthy/6.0">new features in JGit</a> for additional information.
 		</p><hr class="navigation-separator"/>
 		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
 			<tr>
@@ -41,8 +41,8 @@
 					</a>
 				</td>
 				<td style="width: 60%" align="center">
-					<a href="5.13.html" title="EGit 5.13 New and Noteworthy">
-						<img alt="EGit 5.13 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+					<a href="6.0.html" title="EGit 6.0 New and Noteworthy">
+						<img alt="EGit 6.0 New and Noteworthy" border="0" src="../../../images/home.gif"/>
 					</a>
 				</td>
 				<td style="width: 20%" align="right">
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.0/Updating-This-Document.html
index e8003d6986..dfefcfa5af 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.13/Updating-This-Document.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.0/Updating-This-Document.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-		<title>EGit 5.13 New and Noteworthy - Updating This Document</title>
+		<title>EGit 6.0 New and Noteworthy - Updating This Document</title>
 		<link type="text/css" rel="stylesheet" href="../../../book.css"/>
 	</head>
 	<body>
@@ -29,7 +29,7 @@
 		<p>					This document is maintained in a collaborative wiki. If you wish to
 								update or modify this document please visit
 								
-			<a href="https://wiki.eclipse.org/EGit/New_and_Noteworthy/5.13" target="egit_external">https://wiki.eclipse.org/EGit/New_and_Noteworthy/5.13</a>
+			<a href="https://wiki.eclipse.org/EGit/New_and_Noteworthy/6.0" target="egit_external">https://wiki.eclipse.org/EGit/New_and_Noteworthy/6.0</a>
 		</p><hr class="navigation-separator"/>
 		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
 			<tr>
@@ -39,8 +39,8 @@
 					</a>
 				</td>
 				<td style="width: 60%" align="center">
-					<a href="5.13.html" title="EGit 5.13 New and Noteworthy">
-						<img alt="EGit 5.13 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+					<a href="6.0.html" title="EGit 6.0 New and Noteworthy">
+						<img alt="EGit 6.0 New and Noteworthy" border="0" src="../../../images/home.gif"/>
 					</a>
 				</td>
 				<td style="width: 20%" align="right"></td>
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.0/images/EGit_6.0_Fetch_PR_Dialog.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.0/images/EGit_6.0_Fetch_PR_Dialog.png
new file mode 100644
index 0000000000..7242ea9e0b
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.0/images/EGit_6.0_Fetch_PR_Dialog.png
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.0/images/EGit_6.0_Fetch_PR_RepoView.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.0/images/EGit_6.0_Fetch_PR_RepoView.png
new file mode 100644
index 0000000000..32891f495b
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.0/images/EGit_6.0_Fetch_PR_RepoView.png
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.0/images/EGit_6.0_SSH_agent_Preference.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.0/images/EGit_6.0_SSH_agent_Preference.png
new file mode 100644
index 0000000000..fa772a5f25
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.0/images/EGit_6.0_SSH_agent_Preference.png
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.0/images/EGit_6.0_Server_Preferences.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.0/images/EGit_6.0_Server_Preferences.png
new file mode 100644
index 0000000000..4d702fc58d
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.0/images/EGit_6.0_Server_Preferences.png
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.13/5.13.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.13/5.13.html
deleted file mode 100644
index 69b871cc98..0000000000
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.13/5.13.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-		<title>JGit 5.13 New and Noteworthy</title>
-		<link type="text/css" rel="stylesheet" href="../../../book.css"/>
-	</head>
-	<body>
-		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
-			<tr>
-				<th style="width: 100%" align="center" colspan="3">JGit 5.13 New and Noteworthy</th>
-			</tr>
-			<tr>
-				<td style="width: 20%" align="left"></td>
-				<td style="width: 60%" align="center"></td>
-				<td style="width: 20%" align="right">
-					<a href="Contributors.html" title="Contributors">
-						<img alt="Next" border="0" src="../../../images/next.gif"/>
-					</a>
-				</td>
-			</tr>
-			<tr>
-				<td style="width: 20%" align="left" valign="top"></td>
-				<td style="width: 60%" align="center"></td>
-				<td style="width: 20%" align="right" valign="top">Contributors</td>
-			</tr>
-		</table><hr class="navigation-separator"/>
-		<h1 id="JGit">JGit</h1>
-		<h2 id="GPG">GPG</h2>
-		<p>The GPG support in bundle <code>org.eclipse.jgit.gpg.bc</code> now also honors the <tt>
-			<b>GNUPGHOME</b></tt> environment variable. If set and containing a valid path of a directory, that directory is used as the GPG home directory -- the one that contains the GPG keys. If this environment variable is not set, JGit by default uses <tt>%APPDATA%\gnupg</tt> on Windows and <tt>~/.gnupg</tt> on other operating systems.
-		</p>
-		<p>If neither is appropriate, users can set the Java system property <tt>
-			<b>jgit.gpg.home</b></tt> to define the path. If set and containing a valid directory path, that directory is used (even if GNUPGHOME is also set).
-		</p>
-		<h2 id="Dependencies">Dependencies</h2>
-		<ul>
-			<li>Bundle <code>org.eclipse.jgit.gpg.bc</code> newly requires 
-				<a href="https://www.bouncycastle.org/" target="egit_external">Bouncy Castle</a> 
-				<b>1.69</b> (previously 1.65).
-			</li>
-			<li>Bundle <code>org.eclipse.jgit.ssh.apache</code> newly requires 
-				<a href="https://mina.apache.org/sshd-project/" target="egit_external">Apache MINA sshd</a> 
-				<b>2.7.0</b> (previously 2.6.0). As always, this bundle may not work with newer versions of Apache MINA sshd because of incompatible upstream API changes.
-			</li>
-		</ul>
-		<h2 id="Other_Changes">Other Changes</h2>
-		<p>The complete list of new features and bug fixes is available in the 
-			<a href="https://projects.eclipse.org/projects/technology.jgit/releases/5.13.0/" target="egit_external">release notes</a>.
-		</p><hr class="navigation-separator"/>
-		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
-			<tr>
-				<td style="width: 20%" align="left"></td>
-				<td style="width: 60%" align="center"></td>
-				<td style="width: 20%" align="right">
-					<a href="Contributors.html" title="Contributors">
-						<img alt="Next" border="0" src="../../../images/next.gif"/>
-					</a>
-				</td>
-			</tr>
-			<tr>
-				<td style="width: 20%" align="left" valign="top"></td>
-				<td style="width: 60%" align="center"></td>
-				<td style="width: 20%" align="right" valign="top">Contributors</td>
-			</tr>
-		</table>
-	</body>
-</html>
-\ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/6.0/6.0.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/6.0/6.0.html
new file mode 100644
index 0000000000..8bf7fbd780
--- /dev/null
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/6.0/6.0.html
@@ -0,0 +1,81 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>JGit 6.0 New and Noteworthy</title>
+		<link type="text/css" rel="stylesheet" href="../../../book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">JGit 6.0 New and Noteworthy</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Contributors.html" title="Contributors">
+						<img alt="Next" border="0" src="../../../images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Contributors</td>
+			</tr>
+		</table><hr class="navigation-separator"/>
+		<h1 id="JGit">JGit</h1>
+		<h2 id="Prerequisites">Prerequisites</h2>
+		<p>JGit 6.0 
+			<b>requires Java 11</b> to run. Previous versions required a minimum of Java 1.8.
+		</p>
+		<p>Please note that memory management in Java is different between Java versions; there are new garbage collection strategies. One corporate user of JGit who has been using it for a long time running on Java 11 reported that switching from Java 1.8 to Java 11 and using the new G1GC default garbage collector improved stability but might require about 10% more memory.</p>
+		<h2 id="API_changes">API changes</h2>
+		<ul>
+			<li><code>CommitCommand.setCredentialsProvider()</code> is now fluent, returning the CommitCommand itself to allow chaining setters.</li>
+		</ul>
+		<p>For the full list of API changes, see the automated API comparison report linked on 
+			<a href="https://www.eclipse.org/jgit/download/" target="egit_external">the JGit download page</a>.
+		</p>
+		<h2 id="SSH_Agent_Support">SSH Agent Support</h2>
+		<p>JGit 6.0 comes with a new bundle <code>org.eclipse.jgit.ssh.apache.agent</code>, which provides support for communicating with an SSH agent:</p>
+		<ul>
+			<li>On Windows, it supports detecting Pageant, the SSH agent of PuTTY, and communicating with it through its shared memory mechanism.</li>
+			<li>On Unix (Linux, BSD, OS X), it supports communicating with an SSH agent via the usual Unix domain socket mechanism. The Unix domain socket file is given via environment variable 
+				<b><tt>SSH_AUTH_SOCK</tt></b>.
+			</li>
+		</ul>
+		<p>The bundle publishes a service for <tt>java.util.ServiceLoader</tt>; the main SSH support in <code>org.eclipse.jgit.ssh.apache</code> uses the <tt>ServiceLoader</tt> to find the service implementation. If none is found, SSH agent support is not available.</p>
+		<p>Using the new bundle <code>org.eclipse.jgit.ssh.apache.agent</code> is completely optional; and JGit users are free to provide their own implementation instead in a third-party bundle. The bundle just has to publish an <tt>org.eclipse.jgit.transport.sshd.agent.ConnectorFactory</tt> implementation as service. (Ensure that the classpath is set up such that the <tt>ServiceLoader</tt> can find the custom implementation from within bundle <code>org.eclipse.jgit.ssh.apache</code>. In an OSGi environment, this is most easily achieved by making the bundle an OSGi fragment with that bundle as host.)</p>
+		<p>The implementation uses JNA for low-level system operations.</p>
+		<h3 id="Limitations">Limitations</h3>
+		<p>Some directives in the <tt>~/.ssh/config</tt> file are not handled yet:</p>
+		<ul>
+			<li><tt>IdentityAgent</tt></li>
+			<li><tt>AddKeysToAgent</tt></li>
+			<li><tt>SecurityKeyProvider</tt></li>
+		</ul>
+		<p>Support for these is planned for a future version as it needs upstream changes in the Apache MINA sshd library used by JGit for SSH communication.</p>
+		<p>Integration with a native keychain (the <tt>UseKeychain</tt> directive on Mac) is not supported.</p>
+		<p>Agent forwarding is 
+			<i>not</i> supported. Use the <tt>ProxyJump</tt> directive in <tt>~/.ssh/config</tt> instead.
+		</p><hr class="navigation-separator"/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Contributors.html" title="Contributors">
+						<img alt="Next" border="0" src="../../../images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Contributors</td>
+			</tr>
+		</table>
+	</body>
+</html>
+\ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.13/Contributors.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/6.0/Contributors.html
index a171280176..1defa7bf70 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.13/Contributors.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/6.0/Contributors.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-		<title>JGit 5.13 New and Noteworthy - Contributors</title>
+		<title>JGit 6.0 New and Noteworthy - Contributors</title>
 		<link type="text/css" rel="stylesheet" href="../../../book.css"/>
 	</head>
 	<body>
@@ -12,7 +12,7 @@
 			</tr>
 			<tr>
 				<td style="width: 20%" align="left">
-					<a href="5.13.html" title="JGit 5.13 New and Noteworthy">
+					<a href="6.0.html" title="JGit 6.0 New and Noteworthy">
 						<img alt="Previous" border="0" src="../../../images/prev.gif"/>
 					</a>
 				</td>
@@ -24,39 +24,33 @@
 				</td>
 			</tr>
 			<tr>
-				<td style="width: 20%" align="left" valign="top">JGit 5.13 New and Noteworthy</td>
+				<td style="width: 20%" align="left" valign="top">JGit 6.0 New and Noteworthy</td>
 				<td style="width: 60%" align="center"></td>
 				<td style="width: 20%" align="right" valign="top">Updating This Document</td>
 			</tr>
 		</table><hr class="navigation-separator"/>
 		<h1 id="Contributors">Contributors</h1>
-		<p>The following 16 developers worked on this release:</p>
-		<p>Alina Djamankulova,
-			Andrew Xian,
-			Antonio Barone,
-			Bruno Albuquerque,
-			Demetr Starshov,
-			Fabio Ponciroli,
+		<p>The following 10 developers worked on this release:</p>
+		<p>Alex Blewitt,
+			Alina Djamankulova,
 			Han-Wen Nienhuys,
+			Ivan Frade,
 			Julian Ruppel,
-			Kaushik Lingarkar,
 			Kyle Zhao,
-			Luca Milanesio,
 			Marco Miller,
 			Matthias Sohn,
-			Minh Thai,
-			Ronald Bhuleskar,
+			Saša Živkov,
 			Thomas Wolf</p><hr class="navigation-separator"/>
 		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
 			<tr>
 				<td style="width: 20%" align="left">
-					<a href="5.13.html" title="JGit 5.13 New and Noteworthy">
+					<a href="6.0.html" title="JGit 6.0 New and Noteworthy">
 						<img alt="Previous" border="0" src="../../../images/prev.gif"/>
 					</a>
 				</td>
 				<td style="width: 60%" align="center">
-					<a href="5.13.html" title="JGit 5.13 New and Noteworthy">
-						<img alt="JGit 5.13 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+					<a href="6.0.html" title="JGit 6.0 New and Noteworthy">
+						<img alt="JGit 6.0 New and Noteworthy" border="0" src="../../../images/home.gif"/>
 					</a>
 				</td>
 				<td style="width: 20%" align="right">
@@ -66,7 +60,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td style="width: 20%" align="left" valign="top">JGit 5.13 New and Noteworthy</td>
+				<td style="width: 20%" align="left" valign="top">JGit 6.0 New and Noteworthy</td>
 				<td style="width: 60%" align="center"></td>
 				<td style="width: 20%" align="right" valign="top">Updating This Document</td>
 			</tr>
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.13/Updating-This-Document.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/6.0/Updating-This-Document.html
index 0135d58da9..1d798ccaf2 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.13/Updating-This-Document.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/6.0/Updating-This-Document.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-		<title>JGit 5.13 New and Noteworthy - Updating This Document</title>
+		<title>JGit 6.0 New and Noteworthy - Updating This Document</title>
 		<link type="text/css" rel="stylesheet" href="../../../book.css"/>
 	</head>
 	<body>
@@ -29,7 +29,7 @@
 		<p>					This document is maintained in a collaborative wiki. If you wish to
 								update or modify this document please visit
 								
-			<a href="https://wiki.eclipse.org/JGit/New_and_Noteworthy/5.13" target="egit_external">https://wiki.eclipse.org/JGit/New_and_Noteworthy/5.13</a>
+			<a href="https://wiki.eclipse.org/JGit/New_and_Noteworthy/6.0" target="egit_external">https://wiki.eclipse.org/JGit/New_and_Noteworthy/6.0</a>
 		</p><hr class="navigation-separator"/>
 		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
 			<tr>
@@ -39,8 +39,8 @@
 					</a>
 				</td>
 				<td style="width: 60%" align="center">
-					<a href="5.13.html" title="JGit 5.13 New and Noteworthy">
-						<img alt="JGit 5.13 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+					<a href="6.0.html" title="JGit 6.0 New and Noteworthy">
+						<img alt="JGit 6.0 New and Noteworthy" border="0" src="../../../images/home.gif"/>
 					</a>
 				</td>
 				<td style="width: 20%" align="right"></td>
diff --git a/org.eclipse.egit.doc/help/toc.xml b/org.eclipse.egit.doc/help/toc.xml
index 282c4ef5ed..dfe874c1e8 100644
--- a/org.eclipse.egit.doc/help/toc.xml
+++ b/org.eclipse.egit.doc/help/toc.xml
@@ -450,28 +450,31 @@
 		</topic>
 		<topic href="help/JGit/User_Guide/Updating-This-Document.html" label="Updating This Document"></topic>
 	</topic>
-	<topic href="help/EGit/New_and_Noteworthy/5.13/5.13.html" label="EGit 5.13 New and Noteworthy">
-		<topic href="help/EGit/New_and_Noteworthy/5.13/5.13.html" label="EGit">
-			<topic href="help/EGit/New_and_Noteworthy/5.13/5.13.html#Blame" label="Blame"></topic>
-			<topic href="help/EGit/New_and_Noteworthy/5.13/5.13.html#Comparisons" label="Comparisons">
-				<topic href="help/EGit/New_and_Noteworthy/5.13/5.13.html#Compare_Editor" label="Compare Editor"></topic>
-				<topic href="help/EGit/New_and_Noteworthy/5.13/5.13.html#New_Comparison_Commands" label="New Comparison Commands"></topic>
-			</topic>
-			<topic href="help/EGit/New_and_Noteworthy/5.13/5.13.html#API" label="API"></topic>
-			<topic href="help/EGit/New_and_Noteworthy/5.13/5.13.html#Other_Changes" label="Other Changes"></topic>
+	<topic href="help/EGit/New_and_Noteworthy/6.0/6.0.html" label="EGit 6.0 New and Noteworthy">
+		<topic href="help/EGit/New_and_Noteworthy/6.0/6.0.html" label="EGit">
+			<topic href="help/EGit/New_and_Noteworthy/6.0/6.0.html#Prerequisites" label="Prerequisites"></topic>
+			<topic href="help/EGit/New_and_Noteworthy/6.0/6.0.html#Fetching_Pull_Requests" label="Fetching Pull Requests">
+				<topic href="help/EGit/New_and_Noteworthy/6.0/6.0.html#Configuring_Hosts_for_Pull_Requests" label="Configuring Hosts for Pull Requests"></topic>
+			</topic>
+			<topic href="help/EGit/New_and_Noteworthy/6.0/6.0.html#SSH_Agent" label="SSH Agent">
+				<topic href="help/EGit/New_and_Noteworthy/6.0/6.0.html#Limitations" label="Limitations"></topic>
+			</topic>
+			<topic href="help/EGit/New_and_Noteworthy/6.0/6.0.html#Other_Changes" label="Other Changes"></topic>
 		</topic>
-		<topic href="help/EGit/New_and_Noteworthy/5.13/Contributors.html" label="Contributors"></topic>
-		<topic href="help/EGit/New_and_Noteworthy/5.13/See-Also.html" label="See Also"></topic>
-		<topic href="help/EGit/New_and_Noteworthy/5.13/Updating-This-Document.html" label="Updating This Document"></topic>
+		<topic href="help/EGit/New_and_Noteworthy/6.0/Contributors.html" label="Contributors"></topic>
+		<topic href="help/EGit/New_and_Noteworthy/6.0/See-Also.html" label="See Also"></topic>
+		<topic href="help/EGit/New_and_Noteworthy/6.0/Updating-This-Document.html" label="Updating This Document"></topic>
 	</topic>
-	<topic href="help/JGit/New_and_Noteworthy/5.13/5.13.html" label="JGit 5.13 New and Noteworthy">
-		<topic href="help/JGit/New_and_Noteworthy/5.13/5.13.html" label="JGit">
-			<topic href="help/JGit/New_and_Noteworthy/5.13/5.13.html#GPG" label="GPG"></topic>
-			<topic href="help/JGit/New_and_Noteworthy/5.13/5.13.html#Dependencies" label="Dependencies"></topic>
-			<topic href="help/JGit/New_and_Noteworthy/5.13/5.13.html#Other_Changes" label="Other Changes"></topic>
+	<topic href="help/JGit/New_and_Noteworthy/6.0/6.0.html" label="JGit 6.0 New and Noteworthy">
+		<topic href="help/JGit/New_and_Noteworthy/6.0/6.0.html" label="JGit">
+			<topic href="help/JGit/New_and_Noteworthy/6.0/6.0.html#Prerequisites" label="Prerequisites"></topic>
+			<topic href="help/JGit/New_and_Noteworthy/6.0/6.0.html#API_changes" label="API changes"></topic>
+			<topic href="help/JGit/New_and_Noteworthy/6.0/6.0.html#SSH_Agent_Support" label="SSH Agent Support">
+				<topic href="help/JGit/New_and_Noteworthy/6.0/6.0.html#Limitations" label="Limitations"></topic>
+			</topic>
 		</topic>
-		<topic href="help/JGit/New_and_Noteworthy/5.13/Contributors.html" label="Contributors"></topic>
-		<topic href="help/JGit/New_and_Noteworthy/5.13/Updating-This-Document.html" label="Updating This Document"></topic>
+		<topic href="help/JGit/New_and_Noteworthy/6.0/Contributors.html" label="Contributors"></topic>
+		<topic href="help/JGit/New_and_Noteworthy/6.0/Updating-This-Document.html" label="Updating This Document"></topic>
 	</topic>
 	<topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" label="Git for Eclipse Users">
 		<topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" label="Centralised version control systems"></topic>
@@ -499,7 +502,6 @@
 					<topic href="help/EGit/Contributor_Guide/Manual-Developer-Setup.html#EGit" label="EGit"></topic>
 					<topic href="help/EGit/Contributor_Guide/Manual-Developer-Setup.html#JGit" label="JGit"></topic>
 					<topic href="help/EGit/Contributor_Guide/Manual-Developer-Setup.html#EGit_GitHub_Integration" label="EGit GitHub Integration"></topic>
-					<topic href="help/EGit/Contributor_Guide/Manual-Developer-Setup.html#EGit_PDE_Tools" label="EGit PDE Tools"></topic>
 				</topic>
 			</topic>
 			<topic href="help/EGit/Contributor_Guide/Manual-Developer-Setup.html#Development_IDE_Configuration" label="Development IDE Configuration">
diff --git a/org.eclipse.egit.repository/category.xml b/org.eclipse.egit.repository/category.xml
index 728166d79b..6ab501a18b 100644
--- a/org.eclipse.egit.repository/category.xml
+++ b/org.eclipse.egit.repository/category.xml
@@ -165,10 +165,52 @@
    <bundle id="com.sun.jna.platform.source">
       <category name="EGit.dependencies"/>
    </bundle>
-   <bundle id="javax.servlet">
+   <bundle id="jakarta.servlet-api">
       <category name="EGit.dependencies"/>
    </bundle>
-   <bundle id="javax.servlet.source">
+   <bundle id="jakarta.servlet-api.source">
+      <category name="EGit.dependencies"/>
+   </bundle>
+   <bundle id="org.eclipse.jetty.http">
+      <category name="EGit.dependencies"/>
+   </bundle>
+   <bundle id="org.eclipse.jetty.http.source">
+      <category name="EGit.dependencies"/>
+   </bundle>
+   <bundle id="org.eclipse.jetty.io">
+      <category name="EGit.dependencies"/>
+   </bundle>
+   <bundle id="org.eclipse.jetty.io.source">
+      <category name="EGit.dependencies"/>
+   </bundle>
+   <bundle id="org.eclipse.jetty.security">
+      <category name="EGit.dependencies"/>
+   </bundle>
+   <bundle id="org.eclipse.jetty.security.source">
+      <category name="EGit.dependencies"/>
+   </bundle>
+   <bundle id="org.eclipse.jetty.server">
+      <category name="EGit.dependencies"/>
+   </bundle>
+   <bundle id="org.eclipse.jetty.server.source">
+      <category name="EGit.dependencies"/>
+   </bundle>
+   <bundle id="org.eclipse.jetty.servlet">
+      <category name="EGit.dependencies"/>
+   </bundle>
+   <bundle id="org.eclipse.jetty.servlet.source">
+      <category name="EGit.dependencies"/>
+   </bundle>
+   <bundle id="org.eclipse.jetty.util">
+      <category name="EGit.dependencies"/>
+   </bundle>
+   <bundle id="org.eclipse.jetty.util.source">
+      <category name="EGit.dependencies"/>
+   </bundle>
+   <bundle id="org.eclipse.jetty.util.ajax">
+      <category name="EGit.dependencies"/>
+   </bundle>
+   <bundle id="org.eclipse.jetty.util.ajax.source">
       <category name="EGit.dependencies"/>
    </bundle>
    <bundle id="org.apache.commons.compress">
diff --git a/org.eclipse.egit.target/egit-4.17.target b/org.eclipse.egit.target/egit-4.17.target
index 5d45c52689..66f6777d64 100644
--- a/org.eclipse.egit.target/egit-4.17.target
+++ b/org.eclipse.egit.target/egit-4.17.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="egit-4.17" sequenceNumber="1636552884">
+<target name="egit-4.17" sequenceNumber="1637746745">
   <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="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -49,8 +47,6 @@
       <unit id="javaewah.source" version="1.1.13.v20211029-0839"/>
       <unit id="javax.activation" version="1.1.0.v201211130549"/>
       <unit id="javax.activation.source" version="1.1.0.v201211130549"/>
-      <unit id="javax.servlet" version="3.1.0.v201410161800"/>
-      <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
       <unit id="javax.xml.bind.source" version="2.2.0.v201105210648"/>
       <unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
@@ -100,7 +96,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.assertj" version="3.14.0.v20200120-1926"/>
diff --git a/org.eclipse.egit.target/egit-4.17.tpd b/org.eclipse.egit.target/egit-4.17.tpd
index 3b82b86785..476d1d3630 100644
--- a/org.eclipse.egit.target/egit-4.17.tpd
+++ b/org.eclipse.egit.target/egit-4.17.tpd
@@ -1,7 +1,7 @@
 target "egit-4.17" with source configurePhase
 
-include "projects/jetty-9.4.x.tpd"
+include "projects/jetty-10.0.x.tpd"
 include "projects/license.tpd"
 include "projects/swtbot-snapshot.tpd"
-include "orbit/S20211108222137.tpd"
+include "orbit/R20211122181901-2021-12.tpd"
 include "releasetrain/4.17-2020-09.tpd"
diff --git a/org.eclipse.egit.target/egit-4.18.target b/org.eclipse.egit.target/egit-4.18.target
index 97e06e232f..a860162c2e 100644
--- a/org.eclipse.egit.target/egit-4.18.target
+++ b/org.eclipse.egit.target/egit-4.18.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="egit-4.18" sequenceNumber="1636552884">
+<target name="egit-4.18" sequenceNumber="1637746745">
   <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="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -49,8 +47,6 @@
       <unit id="javaewah.source" version="1.1.13.v20211029-0839"/>
       <unit id="javax.activation" version="1.1.0.v201211130549"/>
       <unit id="javax.activation.source" version="1.1.0.v201211130549"/>
-      <unit id="javax.servlet" version="3.1.0.v201410161800"/>
-      <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
       <unit id="javax.xml.bind.source" version="2.2.0.v201105210648"/>
       <unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
@@ -100,7 +96,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.assertj" version="3.14.0.v20200120-1926"/>
diff --git a/org.eclipse.egit.target/egit-4.18.tpd b/org.eclipse.egit.target/egit-4.18.tpd
index 655f23f17d..15f9b85743 100644
--- a/org.eclipse.egit.target/egit-4.18.tpd
+++ b/org.eclipse.egit.target/egit-4.18.tpd
@@ -1,7 +1,7 @@
 target "egit-4.18" with source configurePhase
 
-include "projects/jetty-9.4.x.tpd"
+include "projects/jetty-10.0.x.tpd"
 include "projects/license.tpd"
 include "projects/swtbot-snapshot.tpd"
-include "orbit/S20211108222137.tpd"
+include "orbit/R20211122181901-2021-12.tpd"
 include "releasetrain/4.18-2020-12.tpd"
diff --git a/org.eclipse.egit.target/egit-4.19.target b/org.eclipse.egit.target/egit-4.19.target
index 74f18995f7..9e40f30156 100644
--- a/org.eclipse.egit.target/egit-4.19.target
+++ b/org.eclipse.egit.target/egit-4.19.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="egit-4.19" sequenceNumber="1636552884">
+<target name="egit-4.19" sequenceNumber="1637746745">
   <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="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -49,8 +47,6 @@
       <unit id="javaewah.source" version="1.1.13.v20211029-0839"/>
       <unit id="javax.activation" version="1.1.0.v201211130549"/>
       <unit id="javax.activation.source" version="1.1.0.v201211130549"/>
-      <unit id="javax.servlet" version="3.1.0.v201410161800"/>
-      <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
       <unit id="javax.xml.bind.source" version="2.2.0.v201105210648"/>
       <unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
@@ -100,7 +96,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.assertj" version="3.14.0.v20200120-1926"/>
diff --git a/org.eclipse.egit.target/egit-4.19.tpd b/org.eclipse.egit.target/egit-4.19.tpd
index dc8d0cf676..a238c92105 100644
--- a/org.eclipse.egit.target/egit-4.19.tpd
+++ b/org.eclipse.egit.target/egit-4.19.tpd
@@ -1,7 +1,7 @@
 target "egit-4.19" with source configurePhase
 
-include "projects/jetty-9.4.x.tpd"
+include "projects/jetty-10.0.x.tpd"
 include "projects/license.tpd"
 include "projects/swtbot-snapshot.tpd"
-include "orbit/S20211108222137.tpd"
+include "orbit/R20211122181901-2021-12.tpd"
 include "releasetrain/4.19-2021-03.tpd"
diff --git a/org.eclipse.egit.target/egit-4.20.target b/org.eclipse.egit.target/egit-4.20.target
index 8c6617bbeb..e9f44c0446 100644
--- a/org.eclipse.egit.target/egit-4.20.target
+++ b/org.eclipse.egit.target/egit-4.20.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="egit-4.20" sequenceNumber="1636552884">
+<target name="egit-4.20" sequenceNumber="1637746745">
   <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="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -49,8 +47,6 @@
       <unit id="javaewah.source" version="1.1.13.v20211029-0839"/>
       <unit id="javax.activation" version="1.1.0.v201211130549"/>
       <unit id="javax.activation.source" version="1.1.0.v201211130549"/>
-      <unit id="javax.servlet" version="3.1.0.v201410161800"/>
-      <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
       <unit id="javax.xml.bind.source" version="2.2.0.v201105210648"/>
       <unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
@@ -100,7 +96,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.assertj" version="3.14.0.v20200120-1926"/>
diff --git a/org.eclipse.egit.target/egit-4.20.tpd b/org.eclipse.egit.target/egit-4.20.tpd
index d01a8ac512..2eb330c31c 100644
--- a/org.eclipse.egit.target/egit-4.20.tpd
+++ b/org.eclipse.egit.target/egit-4.20.tpd
@@ -1,7 +1,7 @@
 target "egit-4.20" with source configurePhase
 
-include "projects/jetty-9.4.x.tpd"
+include "projects/jetty-10.0.x.tpd"
 include "projects/license.tpd"
 include "projects/swtbot-snapshot.tpd"
-include "orbit/S20211108222137.tpd"
+include "orbit/R20211122181901-2021-12.tpd"
 include "releasetrain/4.20-2021-06.tpd"
diff --git a/org.eclipse.egit.target/egit-4.21.target b/org.eclipse.egit.target/egit-4.21.target
index 29c08eb742..2e574a12a6 100644
--- a/org.eclipse.egit.target/egit-4.21.target
+++ b/org.eclipse.egit.target/egit-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="egit-4.21" sequenceNumber="1636552884">
+<target name="egit-4.21" sequenceNumber="1637746745">
   <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="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -49,8 +47,6 @@
       <unit id="javaewah.source" version="1.1.13.v20211029-0839"/>
       <unit id="javax.activation" version="1.1.0.v201211130549"/>
       <unit id="javax.activation.source" version="1.1.0.v201211130549"/>
-      <unit id="javax.servlet" version="3.1.0.v201410161800"/>
-      <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
       <unit id="javax.xml.bind.source" version="2.2.0.v201105210648"/>
       <unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
@@ -100,7 +96,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.assertj" version="3.14.0.v20200120-1926"/>
diff --git a/org.eclipse.egit.target/egit-4.21.tpd b/org.eclipse.egit.target/egit-4.21.tpd
index b172f61982..ecff8d7c9d 100644
--- a/org.eclipse.egit.target/egit-4.21.tpd
+++ b/org.eclipse.egit.target/egit-4.21.tpd
@@ -1,7 +1,7 @@
 target "egit-4.21" with source configurePhase
 
-include "projects/jetty-9.4.x.tpd"
+include "projects/jetty-10.0.x.tpd"
 include "projects/license.tpd"
 include "projects/swtbot-snapshot.tpd"
-include "orbit/S20211108222137.tpd"
+include "orbit/R20211122181901-2021-12.tpd"
 include "releasetrain/4.21-2021-09.tpd"
diff --git a/org.eclipse.egit.target/egit-4.22.target b/org.eclipse.egit.target/egit-4.22.target
new file mode 100644
index 0000000000..81b08f2cb1
--- /dev/null
+++ b/org.eclipse.egit.target/egit-4.22.target
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="egit-4.21" sequenceNumber="1637747817">
+  <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="org.eclipse.license.feature.group" version="0.0.0"/>
+      <repository id="eclipse-public-license" location="https://download.eclipse.org/cbi/updates/license/2.0.2.v20181016-2210"/>
+    </location>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
+      <repository id="swtbot-snapshot" location="https://download.eclipse.org/technology/swtbot/snapshots/"/>
+    </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="javax.activation" version="1.1.0.v201211130549"/>
+      <unit id="javax.activation.source" version="1.1.0.v201211130549"/>
+      <unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
+      <unit id="javax.xml.bind.source" version="2.2.0.v201105210648"/>
+      <unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
+      <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.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.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.assertj" version="3.14.0.v20200120-1926"/>
+      <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
+      <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.generator" version="1.3.0.v201305210900"/>
+      <unit id="org.hamcrest.generator.source" version="1.3.0.v201305210900"/>
+      <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
+      <unit id="org.hamcrest.integration.source" version="1.3.0.v201305210900"/>
+      <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.hamcrest.text" version="1.1.0.v20090501071000"/>
+      <unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+    </location>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+      <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.concurrent" version="0.0.0"/>
+      <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.mylyn.team_feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.mylyn_feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.mylyn.context_feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.tools.layout.spy" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/releases/2021-12/"/>
+    </location>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/releases/2020-09/"/>
+    </location>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="javax.xml" version="0.0.0"/>
+      <unit id="org.apache.lucene.analyzers-common" version="6.1.0.v20161115-1612"/>
+      <unit id="org.apache.lucene.core" version="6.1.0.v20170814-1820"/>
+      <unit id="org.apache.lucene.queryparser" version="6.1.0.v20161115-1612"/>
+      <unit id="org.apache.xerces" version="0.0.0"/>
+      <unit id="org.apache.xml.resolver" version="0.0.0"/>
+      <unit id="org.apache.xml.serializer" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/mylyn/releases/latest"/>
+    </location>
+  </locations>
+</target>
diff --git a/org.eclipse.egit.target/egit-4.22.tpd b/org.eclipse.egit.target/egit-4.22.tpd
new file mode 100644
index 0000000000..f3c4a0d7fe
--- /dev/null
+++ b/org.eclipse.egit.target/egit-4.22.tpd
@@ -0,0 +1,7 @@
+target "egit-4.21" with source configurePhase
+
+include "projects/jetty-10.0.x.tpd"
+include "projects/license.tpd"
+include "projects/swtbot-snapshot.tpd"
+include "orbit/R20211122181901-2021-12.tpd"
+include "releasetrain/4.22-2021-12.tpd"
diff --git a/org.eclipse.egit.target/orbit/S20211108222137.tpd b/org.eclipse.egit.target/orbit/R20211122181901-2021-12.tpd
index c6f9abf9d0..554df34320 100644
--- a/org.eclipse.egit.target/orbit/S20211108222137.tpd
+++ b/org.eclipse.egit.target/orbit/R20211122181901-2021-12.tpd
@@ -1,7 +1,7 @@
-target "S20211108222137" with source configurePhase
+target "R20211122181901-2021-12" with source configurePhase
 // see https://download.eclipse.org/tools/orbit/downloads/
 
-location "https://download.eclipse.org/tools/orbit/downloads/drops/S20211108222137/repository" {
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20211122181901/repository" {
 	com.google.gson [2.8.8.v20211029-0838,2.8.8.v20211029-0838]
 	com.google.gson.source [2.8.8.v20211029-0838,2.8.8.v20211029-0838]
 	com.jcraft.jsch [0.1.55.v20190404-1902,0.1.55.v20190404-1902]
@@ -16,8 +16,6 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/S202111082221
 	javaewah.source [1.1.13.v20211029-0839,1.1.13.v20211029-0839]
 	javax.activation [1.1.0.v201211130549,1.1.0.v201211130549]
 	javax.activation.source [1.1.0.v201211130549,1.1.0.v201211130549]
-	javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800]
-	javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800]
 	javax.xml.bind [2.2.0.v201105210648,2.2.0.v201105210648]
 	javax.xml.bind.source [2.2.0.v201105210648,2.2.0.v201105210648]
 	javax.xml.stream [1.0.1.v201004272200,1.0.1.v201004272200]
diff --git a/org.eclipse.egit.target/projects/jetty-10.0.x.tpd b/org.eclipse.egit.target/projects/jetty-10.0.x.tpd
new file mode 100644
index 0000000000..6c3ee18332
--- /dev/null
+++ b/org.eclipse.egit.target/projects/jetty-10.0.x.tpd
@@ -0,0 +1,20 @@
+target "jetty-10.0.x" with source configurePhase
+
+location jetty-10.0.x "https://download.eclipse.org/eclipse/jetty/10.0.6/" {
+	jakarta.servlet-api [4.0.0, 5.0.0)
+	jakarta.servlet-api.source [4.0.0, 5.0.0)
+	org.eclipse.jetty.http [10.0.6,10.0.6]
+	org.eclipse.jetty.http.source [10.0.6,10.0.6]
+	org.eclipse.jetty.io [10.0.6,10.0.6]
+	org.eclipse.jetty.io.source [10.0.6,10.0.6]
+	org.eclipse.jetty.security [10.0.6,10.0.6]
+	org.eclipse.jetty.security.source [10.0.6,10.0.6]
+	org.eclipse.jetty.server [10.0.6,10.0.6]
+	org.eclipse.jetty.server.source [10.0.6,10.0.6]
+	org.eclipse.jetty.servlet [10.0.6,10.0.6]
+	org.eclipse.jetty.servlet.source [10.0.6,10.0.6]
+	org.eclipse.jetty.util [10.0.6,10.0.6]
+	org.eclipse.jetty.util.source [10.0.6,10.0.6]
+	org.eclipse.jetty.util.ajax [10.0.6,10.0.6]
+	org.eclipse.jetty.util.ajax.source [10.0.6,10.0.6]
+}
diff --git a/org.eclipse.egit.target/projects/jetty-9.4.x.tpd b/org.eclipse.egit.target/projects/jetty-9.4.x.tpd
deleted file mode 100644
index 8a143ce24e..0000000000
--- a/org.eclipse.egit.target/projects/jetty-9.4.x.tpd
+++ /dev/null
@@ -1,22 +0,0 @@
-target "jetty-9.4.x" with source configurePhase
-
-location jetty-9.4.x "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.44.v20210927/" {
-	org.eclipse.jetty.client [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.client.source [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.continuation [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.continuation.source [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.http [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.http.source [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.io [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.io.source [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.security [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.security.source [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.server [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.server.source [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.servlet [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.servlet.source [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.util [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.util.source [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.util.ajax [9.4.44.v20210927,9.4.44.v20210927]
-	org.eclipse.jetty.util.ajax.source [9.4.44.v20210927,9.4.44.v20210927]
-}
diff --git a/org.eclipse.egit.target/releasetrain/4.22-2021-12.tpd b/org.eclipse.egit.target/releasetrain/4.22-2021-12.tpd
new file mode 100644
index 0000000000..4990448993
--- /dev/null
+++ b/org.eclipse.egit.target/releasetrain/4.22-2021-12.tpd
@@ -0,0 +1,38 @@
+target "4.22-2021-12" with source configurePhase
+
+location "https://download.eclipse.org/releases/2021-12/" {
+	// Eclipse platform
+	org.eclipse.sdk.ide lazy
+	org.eclipse.ecf.core.feature.feature.group lazy
+	org.eclipse.ecf.filetransfer.feature.feature.group lazy
+	org.eclipse.emf.sdk.feature.group lazy
+	org.eclipse.equinox.concurrent lazy
+
+	// Mylyn integration
+	// TODO: removed temporarily in 2020-12 staging repo
+	// org.eclipse.mylyn.commons.sdk.feature.group lazy
+	org.eclipse.mylyn.ide_feature.feature.group lazy
+	org.eclipse.mylyn.team_feature.feature.group lazy
+	org.eclipse.mylyn_feature.feature.group lazy
+	org.eclipse.mylyn.context_feature.feature.group lazy
+	org.eclipse.mylyn.bugzilla_feature.feature.group lazy
+
+	// debugging SWT layouts
+	org.eclipse.tools.layout.spy lazy
+}
+
+location "https://download.eclipse.org/releases/2020-09/" {
+	// TODO: remove this workaround for temporarily removed feature in 2020-12
+	org.eclipse.mylyn.commons.sdk.feature.group lazy
+}
+
+location "https://download.eclipse.org/mylyn/releases/latest" {
+	// some Mylyn dependencies as bundles, to avoid mylyn.trac, which would lead to conflicts
+	javax.xml lazy
+	org.apache.lucene.analyzers-common [6.1.0,6.2.0)
+	org.apache.lucene.core [6.1.0,6.2.0)
+	org.apache.lucene.queryparser [6.1.0,6.2.0)
+	org.apache.xerces lazy
+	org.apache.xml.resolver lazy
+	org.apache.xml.serializer lazy
+}
+\ No newline at end of file
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/clone/GitCloneWizardHttpsTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/clone/GitCloneWizardHttpsTest.java
index 1dbc707427..72719dc122 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/clone/GitCloneWizardHttpsTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/clone/GitCloneWizardHttpsTest.java
@@ -24,6 +24,7 @@ import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
 import org.eclipse.swtbot.swt.finder.waits.DefaultCondition;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class GitCloneWizardHttpsTest extends GitCloneWizardTestBase {
@@ -34,6 +35,7 @@ public class GitCloneWizardHttpsTest extends GitCloneWizardTestBase {
 		r = new SampleTestRepository(NUMBER_RANDOM_COMMITS, true, true);
 	}
 
+	@Ignore
 	@Test
 	public void canCloneARemoteRepo() throws Exception {
 		destRepo = new File(ResourcesPlugin.getWorkspace().getRoot()
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/clone/GitCloneWizardTestBase.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/clone/GitCloneWizardTestBase.java
index 2782fc3d4c..b79ec4d69c 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/clone/GitCloneWizardTestBase.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/clone/GitCloneWizardTestBase.java
@@ -134,8 +134,10 @@ public abstract class GitCloneWizardTestBase extends LocalRepositoryTestCase {
 
 	@After
 	public void cleanup() throws Exception {
-		if (destRepo != null)
-			FileUtils.delete(destRepo, FileUtils.RECURSIVE | FileUtils.RETRY);
+		if (destRepo != null) {
+			FileUtils.delete(destRepo, FileUtils.RECURSIVE | FileUtils.RETRY
+					| FileUtils.IGNORE_ERRORS);
+		}
 	}
 
 }
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java
index c4ae55e111..22f5e12f61 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java
@@ -31,6 +31,7 @@ import org.eclipse.egit.ui.UIUtils;
 import org.eclipse.egit.ui.internal.UIIcons;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jgit.annotations.Nullable;
+import org.eclipse.jgit.api.errors.CanceledException;
 import org.eclipse.jgit.diff.DiffEntry;
 import org.eclipse.jgit.diff.DiffEntry.ChangeType;
 import org.eclipse.jgit.diff.DiffFormatter;
@@ -39,7 +40,6 @@ import org.eclipse.jgit.diff.MyersDiff;
 import org.eclipse.jgit.diff.RawText;
 import org.eclipse.jgit.diff.RawTextComparator;
 import org.eclipse.jgit.diff.RenameDetector;
-import org.eclipse.jgit.errors.CancelledException;
 import org.eclipse.jgit.errors.CorruptObjectException;
 import org.eclipse.jgit.errors.IncorrectObjectTypeException;
 import org.eclipse.jgit.errors.MissingObjectException;
@@ -178,7 +178,7 @@ public class FileDiff implements GitInfo {
 				renames = detector.compute(walk.getObjectReader(),
 						new EclipseGitProgressTransformer(
 								progress.newChild(1)));
-			} catch (CancelledException e) {
+			} catch (CanceledException e) {
 				cancelled = true;
 			}
 			if (!cancelled) {
author	Matthias Sohn	2021-11-24 16:50:53 +0000
committer	Matthias Sohn	2021-11-24 16:50:53 +0000
commit	7b81c171d4f155925a4c236c7d1670030cc14013 (patch)
tree	a7e7a8b0f3cf99aa117c6e39a115e6576a2af198
parent	46db8108d7437ec492ae7ca953850299d465619c (diff)
parent	5ea0d9251efed90cf84236940ed666fbffa0f510 (diff)
download	egit-7b81c171d4f155925a4c236c7d1670030cc14013.tar.gz egit-7b81c171d4f155925a4c236c7d1670030cc14013.tar.xz egit-7b81c171d4f155925a4c236c7d1670030cc14013.zip