diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000..14db7e6
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,46 @@
+# Community Code of Conduct
+
+**Version 1.2  
+August 19, 2020**
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as community members, contributors, committers, and project leaders pledge to make participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+*   Using welcoming and inclusive language
+*   Being respectful of differing viewpoints and experiences
+*   Gracefully accepting constructive criticism
+*   Focusing on what is best for the community
+*   Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+*   The use of sexualized language or imagery and unwelcome sexual attention or advances
+*   Trolling, insulting/derogatory comments, and personal or political attacks
+*   Public or private harassment
+*   Publishing others' private information, such as a physical or electronic address, without explicit permission
+*   Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+With the support of the Eclipse Foundation staff (the “Staff”), project committers and leaders are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project committers and leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies within all project spaces, and it also applies when an individual is representing the Eclipse Foundation project or its community in public spaces. Examples of representing a project or community include posting via an official social media account, or acting as a project representative at an online or offline event. Representation of a project may be further defined and clarified by project committers, leaders, or the EMO.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the Staff at codeofconduct@eclipse.org. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The Staff is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project committers or leaders who do not follow the Code of Conduct in good faith may face temporary or permanent repercussions as determined by the Staff.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org) , version 1.4, available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct.html](https://www.contributor-covenant.org/version/1/4/code-of-conduct/)
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4818589..e0859d2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,44 +1,33 @@
-Contributing
-============
+# Contributing
 
-Please refer to the contributor guide for all the details:
+Please refer to the [contributor guide](https://wiki.eclipse.org/EGit/Contributor_Guide) for all the details.
+Contributions require that you sign the [Eclipse Contributor Agreement](https://www.eclipse.org/legal/ECA.php).
 
-https://wiki.eclipse.org/EGit/Contributor_Guide
-
-
-Reporting bugs
---------------
+## Reporting bugs
 
 For anything other than small changes, it's a good idea to open a bug
 report for it (in case one doesn't already exist). This gives others the
-chance to give input and is useful for tracking. Create one here:
+chance to give input and is useful for tracking. 
+[Create JGit bugs here](https://bugs.eclipse.org/bugs/enter_bug.cgi?product=JGit).
 
-https://bugs.eclipse.org/bugs/enter_bug.cgi?product=JGit
+## Submitting changes
 
-
-Submitting changes
-------------------
-
-We use Gerrit to review all changes by committers or contributors before
-they are merged:
-
-https://git.eclipse.org/r/
-
-Make sure you have an account and have set up the `commit-msg` hook
+- We use [Gerrit](https://git.eclipse.org/r/) to review all changes by committers
+or contributors before they are merged.
+- Make sure you have an account and have set up the `commit-msg` hook
 before committing.
-
-When committing your changes, see the contributor guide or other commits
+- When committing your changes, see the contributor guide or other commits
 on what your commit message should include.
-
-Run the following to push your change for review (with `username`
+- Run the following to push your change for review (with `username`
 replaced by your Gerrit username):
 
-    git push ssh://username@git.eclipse.org:29418/jgit/jgit.git HEAD:refs/for/master
+```bash
+git push ssh://username@git.eclipse.org:29418/jgit/jgit.git HEAD:refs/for/master
+```
 
-Add the link to the review as a comment on the bug report, so that
+- Add the link to the review as a comment on the bug report, so that
 people coming from the bug report can find it.
-
-Then wait for someone to review your change. If there is something to be
+- Then wait for someone to review your change. If there is something to be
 corrected, amend your commit and push it again.
 
 Have fun :).
diff --git a/DEPENDENCIES b/DEPENDENCIES
index 9dbca62..ebbe480 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -1,66 +1,69 @@
 maven/mavencentral/args4j/args4j/2.33, MIT, approved, CQ11068
-maven/mavencentral/com.google.code.gson/gson/2.8.6, Apache-2.0, approved, CQ23102
-maven/mavencentral/com.googlecode.javaewah/JavaEWAH/1.1.7, Apache-2.0, approved, CQ11658
+maven/mavencentral/com.google.code.gson/gson/2.8.7, Apache-2.0, approved, CQ23496
+maven/mavencentral/com.googlecode.javaewah/JavaEWAH/1.1.12, Apache-2.0, approved, CQ11658
 maven/mavencentral/com.jcraft/jsch/0.1.55, BSD-3-Clause, approved, CQ19435
 maven/mavencentral/com.jcraft/jzlib/1.1.1, BSD-2-Clause, approved, CQ6218
-maven/mavencentral/commons-codec/commons-codec/1.11, Apache-2.0, approved, CQ15971
+maven/mavencentral/commons-codec/commons-codec/1.11, Apache-2.0 AND BSD-3-Clause, approved, CQ15971
 maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ10162
-maven/mavencentral/javax.servlet/javax.servlet-api/3.1.0, Apache-2.0 AND (CDDL-1.1 OR GPL-2.0 WITH Classpath-exception-2.0), approved, emo_ip_team
+maven/mavencentral/javax.servlet/javax.servlet-api/3.1.0, Apache-2.0 AND (CDDL-1.1 OR GPL-2.0 WITH Classpath-exception-2.0), approved, CQ7248
 maven/mavencentral/junit/junit/4.13, , approved, CQ22796
 maven/mavencentral/log4j/log4j/1.2.15, Apache-2.0, approved, CQ7837
 maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.9.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/net.bytebuddy/byte-buddy/1.9.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/net.i2p.crypto/eddsa/0.3.0, CC0, approved, CQ17804
+maven/mavencentral/net.i2p.crypto/eddsa/0.3.0, CC0-1.0, approved, CQ22537
 maven/mavencentral/net.sf.jopt-simple/jopt-simple/4.6, MIT, approved, clearlydefined
 maven/mavencentral/org.apache.ant/ant-launcher/1.10.10, Apache-2.0 AND W3C AND LicenseRef-Public-Domain, approved, CQ15560
 maven/mavencentral/org.apache.ant/ant/1.10.10, Apache-2.0 AND W3C AND LicenseRef-Public-Domain, approved, CQ15560
-maven/mavencentral/org.apache.commons/commons-compress/1.19, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.apache.commons/commons-compress/1.20, Apache-2.0 AND BSD-3-Clause AND LicenseRef-Public-Domain, approved, CQ21771
 maven/mavencentral/org.apache.commons/commons-math3/3.2, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.apache.httpcomponents/httpclient/4.5.13, Apache-2.0, approved, CQ22761
-maven/mavencentral/org.apache.httpcomponents/httpcore/4.4.14, Apache-2.0, approved, CQ18704
-maven/mavencentral/org.apache.sshd/sshd-common/2.6.0, Apache-2.0 AND ISC, approved, CQ22992
-maven/mavencentral/org.apache.sshd/sshd-core/2.6.0, Apache-2.0 AND ISC, approved, CQ22992
-maven/mavencentral/org.apache.sshd/sshd-osgi/2.6.0, Apache-2.0 AND ISC, approved, CQ22992
-maven/mavencentral/org.apache.sshd/sshd-sftp/2.6.0, Apache-2.0 AND ISC, approved, CQ22993
-maven/mavencentral/org.assertj/assertj-core/3.14.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.bouncycastle/bcpg-jdk15on/1.65, Apache-2.0, approved, CQ21975
-maven/mavencentral/org.bouncycastle/bcpkix-jdk15on/1.65, MIT AND LicenseRef-Public-Domain, approved, CQ21976
-maven/mavencentral/org.bouncycastle/bcprov-jdk15on/1.65.01, MIT AND LicenseRef-Public-Domain, approved, CQ21977
-maven/mavencentral/org.eclipse.jetty/jetty-http/9.4.41.v20210516, , approved, eclipse
-maven/mavencentral/org.eclipse.jetty/jetty-io/9.4.41.v20210516, , approved, eclipse
-maven/mavencentral/org.eclipse.jetty/jetty-security/9.4.41.v20210516, , approved, eclipse
-maven/mavencentral/org.eclipse.jetty/jetty-server/9.4.41.v20210516, , approved, eclipse
-maven/mavencentral/org.eclipse.jetty/jetty-servlet/9.4.41.v20210516, , approved, eclipse
-maven/mavencentral/org.eclipse.jetty/jetty-util-ajax/9.4.41.v20210516, , approved, eclipse
-maven/mavencentral/org.eclipse.jetty/jetty-util/9.4.41.v20210516, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ant.test/5.12.0-SNAPSHOT, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ant/5.12.0-SNAPSHOT, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.archive/5.12.0-SNAPSHOT, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.gpg.bc/5.12.0-SNAPSHOT, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.apache/5.12.0-SNAPSHOT, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.server/5.12.0-SNAPSHOT, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.test/5.12.0-SNAPSHOT, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit.http/5.12.0-SNAPSHOT, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit.ssh/5.12.0-SNAPSHOT, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit/5.12.0-SNAPSHOT, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.server.test/5.12.0-SNAPSHOT, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.server/5.12.0-SNAPSHOT, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.test/5.12.0-SNAPSHOT, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs/5.12.0-SNAPSHOT, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.pgm.test/5.12.0-SNAPSHOT, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.pgm/5.12.0-SNAPSHOT, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.apache.test/5.12.0-SNAPSHOT, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.apache/5.12.0-SNAPSHOT, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.jsch/5.12.0-SNAPSHOT, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.test/5.12.0-SNAPSHOT, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ui/5.12.0-SNAPSHOT, , approved, eclipse
-maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit/5.12.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.apache.httpcomponents/httpclient/4.5.13, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ23527
+maven/mavencentral/org.apache.httpcomponents/httpcore/4.4.14, Apache-2.0, approved, CQ23528
+maven/mavencentral/org.apache.sshd/sshd-common/2.7.0, Apache-2.0 and ISC, approved, CQ23469
+maven/mavencentral/org.apache.sshd/sshd-core/2.7.0, Apache-2.0, approved, CQ23469
+maven/mavencentral/org.apache.sshd/sshd-osgi/2.7.0, Apache-2.0 and ISC, approved, CQ23469
+maven/mavencentral/org.apache.sshd/sshd-sftp/2.7.0, Apache-2.0, approved, CQ23470
+maven/mavencentral/org.assertj/assertj-core/3.20.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.bouncycastle/bcpg-jdk15on/1.69, MIT and Apache-2.0, approved, CQ23472
+maven/mavencentral/org.bouncycastle/bcpkix-jdk15on/1.69, MIT, approved, CQ23473
+maven/mavencentral/org.bouncycastle/bcprov-jdk15on/1.69, MIT, approved, CQ23471
+maven/mavencentral/org.bouncycastle/bcutil-jdk15on/1.69, MIT, approved, CQ23474
+maven/mavencentral/org.eclipse.jetty/jetty-http/9.4.43.v20210629, , approved, eclipse
+maven/mavencentral/org.eclipse.jetty/jetty-io/9.4.43.v20210629, , approved, eclipse
+maven/mavencentral/org.eclipse.jetty/jetty-security/9.4.43.v20210629, , approved, eclipse
+maven/mavencentral/org.eclipse.jetty/jetty-server/9.4.43.v20210629, , approved, eclipse
+maven/mavencentral/org.eclipse.jetty/jetty-servlet/9.4.43.v20210629, , approved, eclipse
+maven/mavencentral/org.eclipse.jetty/jetty-util-ajax/9.4.43.v20210629, , approved, eclipse
+maven/mavencentral/org.eclipse.jetty/jetty-util/9.4.43.v20210629, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ant.test/5.13.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ant/5.13.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.archive/5.13.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.gpg.bc/5.13.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.apache/5.13.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.server/5.13.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.test/5.13.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit.http/5.13.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit.ssh/5.13.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit/5.13.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.server.test/5.13.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.server/5.13.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.test/5.13.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs/5.13.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.pgm.test/5.13.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.pgm/5.13.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.apache.test/5.13.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.apache/5.13.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.jsch/5.13.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.test/5.13.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ui/5.13.0-SNAPSHOT, , approved, eclipse
+maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit/5.13.0-SNAPSHOT, , approved, eclipse
 maven/mavencentral/org.hamcrest/hamcrest-core/1.3, BSD-2-Clause, approved, CQ7063
+maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-2-Clause, approved, clearlydefined
 maven/mavencentral/org.mockito/mockito-core/2.23.0, MIT, approved, CQ17976
 maven/mavencentral/org.objenesis/objenesis/2.6, Apache-2.0, approved, CQ15478
-maven/mavencentral/org.openjdk.jmh/jmh-core/1.21, GPL-2.0, approved, CQ20517
-maven/mavencentral/org.openjdk.jmh/jmh-generator-annprocess/1.21, GPL-2.0, approved, CQ20518
+maven/mavencentral/org.openjdk.jmh/jmh-core/1.32, GPL-2.0, approved, CQ23499
+maven/mavencentral/org.openjdk.jmh/jmh-generator-annprocess/1.32, GPL-2.0, approved, CQ23500
 maven/mavencentral/org.osgi/org.osgi.core/4.3.1, Apache-2.0, approved, CQ10111
+maven/mavencentral/org.slf4j/jcl-over-slf4j/1.7.30, Apache-2.0, approved, CQ12843
 maven/mavencentral/org.slf4j/slf4j-api/1.7.30, MIT, approved, CQ13368
 maven/mavencentral/org.slf4j/slf4j-log4j12/1.7.30, MIT, approved, CQ7665
-maven/mavencentral/org.tukaani/xz/1.8, LicenseRef-Public-Domain, approved, CQ15386
+maven/mavencentral/org.tukaani/xz/1.9, LicenseRef-Public-Domain, approved, CQ23498
diff --git a/Documentation/config-options.md b/Documentation/config-options.md
index a9ca48c..19bcc33 100644
--- a/Documentation/config-options.md
+++ b/Documentation/config-options.md
@@ -102,6 +102,7 @@
 | `prunePreserved`, only via API of PackConfig | `false` | &#x20DE; | Whether to remove preserved pack files in a preserved directory. |
 | `pack.reuseDeltas` | `true` |&#x20DE; | Whether to reuse deltas existing in repository. |
 | `pack.reuseObjects` | `true` | &#x20DE; | Whether to reuse existing objects representation in repository. |
+| `pack.searchForReuseTimeout` | | &#x20DE; | Search for reuse phase timeout. Expressed as a `Duration`, i.e.: `50sec`. |
 | `pack.singlePack` | `false` | &#x20DE; | Whether all of `refs/*` should be packed in a single pack. |
 | `pack.threads` | `0` (auto-detect number of processors) | &#x2705; | Number of threads to use for delta compression. |
 | `pack.waitPreventRacyPack` | `false` | &#x20DE; | Whether we wait before opening a newly written pack to prevent its lastModified timestamp could be racy. |
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000..e6f57c6
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,49 @@
+<!--- https://www.eclipse.org/security/ --->
+_ISO 27005 defines vulnerability as:
+ "A weakness of an asset or group of assets that can be exploited by one or more threats."_
+
+## The Eclipse Security Team
+
+The Eclipse Security Team provides help and advice to Eclipse projects
+on vulnerability issues and is the first point of contact
+for handling security vulnerabilities.
+Members of the Security Team are committers on Eclipse Projects
+and members of the Eclipse Architecture Council.
+
+Contact the [Eclipse Security Team](mailto:security@eclipse.org).
+
+**Note that, as a matter of policy, the security team does not open attachments.**
+
+## Reporting a Security Vulnerability
+
+Vulnerabilities can be reported either via email to the Eclipse Security Team
+or directly with a project via the Eclipse Foundation's Bugzilla instance.
+
+The general security mailing list address is security@eclipse.org.
+Members of the Eclipse Security Team will receive messages sent to this address.
+This address should be used only for reporting undisclosed vulnerabilities;
+regular issue reports and questions unrelated to vulnerabilities in Eclipse software
+will be ignored.
+Note that this email address is not encrypted.
+
+The community is also encouraged to report vulnerabilities using the
+[Eclipse Foundation's Bugzilla instance](https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Community&component=Vulnerability%20Reports&keywords=security&groups=Security_Advisories).
+Note that you will require an Eclipse Foundation account to create an issue report,
+but by doing so you will be able to participate directly in the resolution of the issue.
+
+Issue reports related to vulnerabilities must be marked as "committers-only",
+either automatically by clicking the provided link, by the reporter,
+or by a committer during the triage process.
+Note that issues marked "committers-only" are visible to all Eclipse committers.
+By default, a "committers-only" issue is also accessible to the reporter
+and individuals explicitly indicated in the "cc" list.
+
+## Disclosure
+
+Disclosure is initially limited to the reporter and all Eclipse Committers,
+but is expanded to include other individuals, and the general public.
+The timing and manner of disclosure is governed by the
+[Eclipse Security Policy](https://www.eclipse.org/security/policy.php).
+
+Publicly disclosed issues are listed on the
+[Disclosed Vulnerabilities Page](https://www.eclipse.org/security/known.php).
\ No newline at end of file
diff --git a/WORKSPACE b/WORKSPACE
index d9c407a..1324ce4 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -55,20 +55,20 @@
     ],
 )
 
-JMH_VERS = "1.21"
+JMH_VERS = "1.32"
 
 maven_jar(
     name = "jmh-core",
     artifact = "org.openjdk.jmh:jmh-core:" + JMH_VERS,
     attach_source = False,
-    sha1 = "442447101f63074c61063858033fbfde8a076873",
+    sha1 = "9a8b69ea08118fd4e5d30a152d37b7087ee4a720",
 )
 
 maven_jar(
     name = "jmh-annotations",
     artifact = "org.openjdk.jmh:jmh-generator-annprocess:" + JMH_VERS,
     attach_source = False,
-    sha1 = "7aac374614a8a76cad16b91f1a4419d31a7dcda3",
+    sha1 = "0a28eccc75e0d65984ce25e1ec4dd021a0ca6c57",
 )
 
 maven_jar(
@@ -105,8 +105,8 @@
 
 maven_jar(
     name = "javaewah",
-    artifact = "com.googlecode.javaewah:JavaEWAH:1.1.7",
-    sha1 = "570dde3cd706ae10c62fe19b150928cfdb415e87",
+    artifact = "com.googlecode.javaewah:JavaEWAH:1.1.12",
+    sha1 = "9feecc2b24d6bc9ff865af8d082f192238a293eb",
 )
 
 maven_jar(
@@ -123,14 +123,14 @@
 
 maven_jar(
     name = "sshd-osgi",
-    artifact = "org.apache.sshd:sshd-osgi:2.6.0",
-    sha1 = "40e365bb799e1bff3d31dc858b1e59a93c123f29",
+    artifact = "org.apache.sshd:sshd-osgi:2.7.0",
+    sha1 = "a101aad0f79ad424498098f7e91c39d3d92177c1",
 )
 
 maven_jar(
     name = "sshd-sftp",
-    artifact = "org.apache.sshd:sshd-sftp:2.6.0",
-    sha1 = "6eddfe8fdf59a3d9a49151e4177f8c1bebeb30c9",
+    artifact = "org.apache.sshd:sshd-sftp:2.7.0",
+    sha1 = "0c9eff7145e20b338c1dd6aca36ba93ed7c0147c",
 )
 
 maven_jar(
@@ -165,14 +165,14 @@
 
 maven_jar(
     name = "commons-compress",
-    artifact = "org.apache.commons:commons-compress:1.19",
-    sha1 = "7e65777fb451ddab6a9c054beb879e521b7eab78",
+    artifact = "org.apache.commons:commons-compress:1.20",
+    sha1 = "b8df472b31e1f17c232d2ad78ceb1c84e00c641b",
 )
 
 maven_jar(
     name = "tukaani-xz",
-    artifact = "org.tukaani:xz:1.8",
-    sha1 = "c4f7d054303948eb6a4066194253886c8af07128",
+    artifact = "org.tukaani:xz:1.9",
+    sha1 = "1ea4bec1a921180164852c65006d928617bd2caf",
 )
 
 maven_jar(
@@ -188,15 +188,9 @@
 )
 
 maven_jar(
-    name = "hamcrest-library",
-    artifact = "org.hamcrest:hamcrest-library:1.3",
-    sha1 = "4785a3c21320980282f9f33d0d1264a69040538f",
-)
-
-maven_jar(
-    name = "hamcrest-core",
-    artifact = "org.hamcrest:hamcrest-core:1.3",
-    sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0",
+    name = "hamcrest",
+    artifact = "org.hamcrest:hamcrest:2.2",
+    sha1 = "1820c0968dba3a11a1b30669bb1f01978a91dedc",
 )
 
 maven_jar(
@@ -207,8 +201,8 @@
 
 maven_jar(
     name = "assertj-core",
-    artifact = "org.assertj:assertj-core:3.14.0",
-    sha1 = "3b7b0fcac821f3d167764e9926573cd64f78f9e9",
+    artifact = "org.assertj:assertj-core:3.20.2",
+    sha1 = "66f1f0ebd6db2b24e4a731979171da16ba919cd5",
 )
 
 BYTE_BUDDY_VERSION = "1.9.0"
@@ -233,80 +227,87 @@
 
 maven_jar(
     name = "gson",
-    artifact = "com.google.code.gson:gson:2.8.6",
-    sha1 = "9180733b7df8542621dc12e21e87557e8c99b8cb",
+    artifact = "com.google.code.gson:gson:2.8.7",
+    sha1 = "69d9503ea0a40ee16f0bcdac7e3eaf83d0fa914a",
 )
 
-JETTY_VER = "9.4.41.v20210516"
+JETTY_VER = "9.4.43.v20210629"
 
 maven_jar(
     name = "jetty-servlet",
     artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VER,
-    sha1 = "ea45368ea7fd04026038f89e6910f17f70939641",
-    src_sha1 = "4acf6b0d1449ccd39b195783e3639ab0da51f7bf",
+    sha1 = "ee000c7dcdbe7b4ef94e3fa67be8f56a46915944",
+    src_sha1 = "50236764fe1d3619ca07f346e148189c4f5b801a",
 )
 
 maven_jar(
     name = "jetty-security",
     artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER,
-    sha1 = "5ba69b1189a9d1f425ed03cbc2c901e0e6023c4d",
-    src_sha1 = "d46f8cb4dad66751d3a588309c6bbc15b80fbad4",
+    sha1 = "ae1958da077c46bac61be9b8de2b45a3aa112353",
+    src_sha1 = "6e5271e91da37e381f566e0db07ab4d936d86104",
 )
 
 maven_jar(
     name = "jetty-server",
     artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER,
-    sha1 = "25b1963b0a1c56202ec37046adc55861815107ce",
-    src_sha1 = "a7f82c9df737316cf0dfafe4a33ca4ae89d780db",
+    sha1 = "8ba04f6b5d00223983684a563a3edaa12282bcf0",
+    src_sha1 = "51600567dbd082fb03feeb9c786f5e7cc9e0a17d",
 )
 
 maven_jar(
     name = "jetty-http",
     artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER,
-    sha1 = "0d460bece4dd9666b46cbd18f8d7fd31cf02ecd9",
-    src_sha1 = "6fa009d950b8fdab8e94003e6295c08d42ee85b7",
+    sha1 = "5171466337a6da7efbf317490b9c4574c0b4b640",
+    src_sha1 = "52f477161fd0fc90869f48a145aa2c86624c496e",
 )
 
 maven_jar(
     name = "jetty-io",
     artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER,
-    sha1 = "820eea368623939c2113902b1ca7a98186f64a73",
-    src_sha1 = "4373285dafb5f79210815d9c15de106cc3e9ac4d",
+    sha1 = "acf672c64ac21851069c5b5b789e5c185a25933f",
+    src_sha1 = "824d5cffce7a72af7c11d9cd87f86184e2a05c17",
 )
 
 maven_jar(
     name = "jetty-util",
     artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER,
-    sha1 = "548c76ea00d7eb3e2bcea273174e5d030639d109",
-    src_sha1 = "ba188de552a0c310f69cf12bea887413ce8f0e78",
+    sha1 = "97306fd3c76171602caad2acc54ca779c9240d5f",
+    src_sha1 = "dffff7271c248d4e21e2b1629c57896b8e631051",
 )
 
 maven_jar(
     name = "jetty-util-ajax",
     artifact = "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VER,
-    sha1 = "d4c1d66fc62796a17548e6c344fbf89b5889f873",
-    src_sha1 = "b60cf77be68137eee4ee13d83c47d684d14b6d90",
+    sha1 = "2500d180c6e8e28eb3b75372b6ea9d457cf37658",
+    src_sha1 = "682470f5ad074e64fc0e9c93bdc2784482f79362",
 )
 
-BOUNCYCASTLE_VER = "1.65"
+BOUNCYCASTLE_VER = "1.69"
 
 maven_jar(
     name = "bcpg",
     artifact = "org.bouncycastle:bcpg-jdk15on:" + BOUNCYCASTLE_VER,
-    sha1 = "f32fc02cc29c9fdcc35c0de4d16964f01777067c",
-    src_sha1 = "508476d5383c7d086b400f5e7c5a8cf4dc8ac4e2",
+    sha1 = "d99a08c3f651b26e8eb668e941b0bbd2c09ece08",
+    src_sha1 = "de1fc261b44a8eb60583413a31ffc98ce3dce38b",
 )
 
 maven_jar(
     name = "bcprov",
-    artifact = "org.bouncycastle:bcprov-jdk15on:1.65.01",
-    sha1 = "0fbd478ea7b07acc3902b9585a37fd88393f8427",
-    src_sha1 = "8f54635075628c69b6c037e800dd0b03ffb8dd51",
+    artifact = "org.bouncycastle:bcprov-jdk15on:" + BOUNCYCASTLE_VER,
+    sha1 = "91e1628251cf3ca90093ce9d0fe67e5b7dab3850",
+    src_sha1 = "67dc6476845f6b29cb520b5df61db65ae56718e4",
+)
+
+maven_jar(
+    name = "bcutil",
+    artifact = "org.bouncycastle:bcutil-jdk15on:" + BOUNCYCASTLE_VER,
+    sha1 = "c3edf93d346e97f64f041e448e7455c39c7eff64",
+    src_sha1 = "deeb3fbbf373e05e2a20941f9a8ce90e9aeab3d2",
 )
 
 maven_jar(
     name = "bcpkix",
     artifact = "org.bouncycastle:bcpkix-jdk15on:" + BOUNCYCASTLE_VER,
-    sha1 = "c9507d93e4b453320b57d9ac21bdd67d65a00bbc",
-    src_sha1 = "16c71e83af43927d20ccad19defcbb0babcbdb26",
+    sha1 = "45c36fb72fafb0b688c6af795e6cc803f6f79ee5",
+    src_sha1 = "8bc5214401459bd91eea816b516079da38374e90",
 )
diff --git a/lib/BUILD b/lib/BUILD
index 83709a3..1901be8 100644
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -148,7 +148,6 @@
 java_library(
     name = "jsch",
     visibility = [
-        "//org.eclipse.jgit:__pkg__",
         "//org.eclipse.jgit.junit.ssh:__pkg__",
         "//org.eclipse.jgit.ssh.jsch:__pkg__",
         "//org.eclipse.jgit.ssh.jsch.test:__pkg__",
@@ -159,7 +158,6 @@
 java_library(
     name = "bcpg",
     visibility = [
-        "//org.eclipse.jgit:__pkg__",
         "//org.eclipse.jgit.gpg.bc:__pkg__",
         "//org.eclipse.jgit.gpg.bc.test:__pkg__",
         "//org.eclipse.jgit.test:__pkg__",
@@ -170,7 +168,6 @@
 java_library(
     name = "bcprov",
     visibility = [
-        "//org.eclipse.jgit:__pkg__",
         "//org.eclipse.jgit.gpg.bc:__pkg__",
         "//org.eclipse.jgit.gpg.bc.test:__pkg__",
         "//org.eclipse.jgit.test:__pkg__",
@@ -179,9 +176,18 @@
 )
 
 java_library(
+    name = "bcutil",
+    visibility = [
+        "//org.eclipse.jgit.gpg.bc:__pkg__",
+        "//org.eclipse.jgit.gpg.bc.test:__pkg__",
+        "//org.eclipse.jgit.test:__pkg__",
+    ],
+    exports = ["@bcutil//jar"],
+)
+
+java_library(
     name = "bcpkix",
     visibility = [
-        "//org.eclipse.jgit:__pkg__",
         "//org.eclipse.jgit.gpg.bc:__pkg__",
         "//org.eclipse.jgit.test:__pkg__",
     ],
@@ -191,7 +197,6 @@
 java_library(
     name = "jzlib",
     visibility = [
-        "//org.eclipse.jgit:__pkg__",
         "//org.eclipse.jgit.ssh.jsch:__pkg__",
         "//org.eclipse.jgit.test:__pkg__",
     ],
@@ -205,8 +210,7 @@
     exports = [
         "@bytebuddy-agent//jar",
         "@bytebuddy//jar",
-        "@hamcrest-core//jar",
-        "@hamcrest-library//jar",
+        "@hamcrest//jar",
         "@junit//jar",
         "@mockito//jar",
         "@objenesis//jar",
diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
index 75451de..d42d349 100644
--- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
@@ -5,13 +5,13 @@
 Automatic-Module-Name: org.eclipse.jgit.ant.test
 Bundle-SymbolicName: org.eclipse.jgit.ant.test
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.tools.ant,
- org.eclipse.jgit.ant.tasks;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.junit;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lib;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util;version="[5.12.1,5.13.0)",
- org.hamcrest.core;version="[1.1.0,2.0.0)",
+ org.eclipse.jgit.ant.tasks;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.junit;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+ org.hamcrest.core;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)"
diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml
index b318fae..6025bb7 100644
--- a/org.eclipse.jgit.ant.test/pom.xml
+++ b/org.eclipse.jgit.ant.test/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ant.test</artifactId>
diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
index ce257c3..aedfe92 100644
--- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.ant
 Bundle-SymbolicName: org.eclipse.jgit.ant
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.tools.ant,
-  org.eclipse.jgit.storage.file;version="[5.12.1,5.13.0)"
+  org.eclipse.jgit.storage.file;version="[5.13.0,5.14.0)"
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.ant;version="5.12.1",
- org.eclipse.jgit.ant.tasks;version="5.12.1";
+Export-Package: org.eclipse.jgit.ant;version="5.13.0",
+ org.eclipse.jgit.ant.tasks;version="5.13.0";
   uses:="org.apache.tools.ant,
    org.apache.tools.ant.types"
diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF
index 9d9ad0c..5ebfee1 100644
--- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.ant - Sources
 Bundle-SymbolicName: org.eclipse.jgit.ant.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.12.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.12.1.qualifier";roots="."
+Bundle-Version: 5.13.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.13.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml
index 4e4a041..718669c 100644
--- a/org.eclipse.jgit.ant/pom.xml
+++ b/org.eclipse.jgit.ant/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ant</artifactId>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.10</version>
+      <version>1.10.11</version>
     </dependency>
   </dependencies>
 
diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
index 3c9e551..654b88f 100644
--- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.archive
 Bundle-SymbolicName: org.eclipse.jgit.archive
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -13,17 +13,17 @@
  org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)",
  org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)",
  org.apache.commons.compress.compressors.xz;version="[1.4,2.0)",
- org.eclipse.jgit.api;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lib;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.nls;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.api;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
  org.osgi.framework;version="[1.3.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.jgit.archive.FormatActivator
-Export-Package: org.eclipse.jgit.archive;version="5.12.1";
+Export-Package: org.eclipse.jgit.archive;version="5.13.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.api,
    org.apache.commons.compress.archivers,
    org.osgi.framework",
- org.eclipse.jgit.archive.internal;version="5.12.1";x-internal:=true
+ org.eclipse.jgit.archive.internal;version="5.13.0";x-internal:=true
diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF
index 54a18ec..0a6a40e 100644
--- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.archive - Sources
 Bundle-SymbolicName: org.eclipse.jgit.archive.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.12.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.12.1.qualifier";roots="."
+Bundle-Version: 5.13.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.13.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml
index b67af49..81927b0 100644
--- a/org.eclipse.jgit.archive/pom.xml
+++ b/org.eclipse.jgit.archive/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.archive</artifactId>
diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml
index dd4b4a9..5e34572 100644
--- a/org.eclipse.jgit.benchmarks/pom.xml
+++ b/org.eclipse.jgit.benchmarks/pom.xml
@@ -14,7 +14,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.eclipse.jgit</groupId>
-  <version>5.12.1-SNAPSHOT</version>
+  <version>5.13.0-SNAPSHOT</version>
   <artifactId>org.eclipse.jgit.benchmarks</artifactId>
   <packaging>jar</packaging>
 
@@ -23,7 +23,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <javac.target>1.8</javac.target>
-    <jmh.version>1.21</jmh.version>
+    <jmh.version>1.32</jmh.version>
     <uberjar.name>benchmarks</uberjar.name>
   </properties>
 
@@ -160,7 +160,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jxr-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.1.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml
index c84b8f3..3e93db8 100644
--- a/org.eclipse.jgit.coverage/pom.xml
+++ b/org.eclipse.jgit.coverage/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -27,88 +27,88 @@
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
-      <version>5.12.1-SNAPSHOT</version>
+      <version>5.13.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ant</artifactId>
-      <version>5.12.1-SNAPSHOT</version>
+      <version>5.13.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.archive</artifactId>
-      <version>5.12.1-SNAPSHOT</version>
+      <version>5.13.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.http.apache</artifactId>
-      <version>5.12.1-SNAPSHOT</version>
+      <version>5.13.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.http.server</artifactId>
-      <version>5.12.1-SNAPSHOT</version>
+      <version>5.13.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.lfs</artifactId>
-      <version>5.12.1-SNAPSHOT</version>
+      <version>5.13.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.lfs.server</artifactId>
-      <version>5.12.1-SNAPSHOT</version>
+      <version>5.13.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.pgm</artifactId>
-      <version>5.12.1-SNAPSHOT</version>
+      <version>5.13.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ui</artifactId>
-      <version>5.12.1-SNAPSHOT</version>
+      <version>5.13.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ssh.apache</artifactId>
-      <version>5.12.1-SNAPSHOT</version>
+      <version>5.13.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.test</artifactId>
-      <version>5.12.1-SNAPSHOT</version>
+      <version>5.13.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ant.test</artifactId>
-      <version>5.12.1-SNAPSHOT</version>
+      <version>5.13.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.http.test</artifactId>
-      <version>5.12.1-SNAPSHOT</version>
+      <version>5.13.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.pgm.test</artifactId>
-      <version>5.12.1-SNAPSHOT</version>
+      <version>5.13.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.lfs.test</artifactId>
-      <version>5.12.1-SNAPSHOT</version>
+      <version>5.13.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.lfs.server.test</artifactId>
-      <version>5.12.1-SNAPSHOT</version>
+      <version>5.13.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ssh.apache.test</artifactId>
-      <version>5.12.1-SNAPSHOT</version>
+      <version>5.13.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/org.eclipse.jgit.gpg.bc.test/BUILD b/org.eclipse.jgit.gpg.bc.test/BUILD
index 4c86eff..35b125f 100644
--- a/org.eclipse.jgit.gpg.bc.test/BUILD
+++ b/org.eclipse.jgit.gpg.bc.test/BUILD
@@ -15,6 +15,7 @@
     deps = [
         "//lib:bcpg",
         "//lib:bcprov",
+        "//lib:bcutil",
         "//lib:junit",
         "//org.eclipse.jgit.gpg.bc:gpg-bc",
         "//org.eclipse.jgit:jgit",
diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
index 0c9cee3..d450796 100644
--- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test
 Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -12,13 +12,12 @@
  org.bouncycastle.openpgp.operator;version="[1.65.0,2.0.0)",
  org.bouncycastle.openpgp.operator.jcajce;version="[1.65.0,2.0.0)",
  org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)",
- org.eclipse.jgit.gpg.bc.internal;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.gpg.bc.internal.keys;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util.sha1;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.gpg.bc.internal;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.gpg.bc.internal.keys;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util.sha1;version="[5.13.0,5.14.0)",
+ org.hamcrest;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.runner;version="[4.13,5.0.0)",
  org.junit.runners;version="[4.13,5.0.0)"
 Export-Package: org.eclipse.jgit.gpg.bc.internal;x-internal:=true,
  org.eclipse.jgit.gpg.bc.internal.keys;x-internal:=true
-Require-Bundle: org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
- org.hamcrest.library;bundle-version="[1.1.0,2.0.0)"
diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml
index 6ecbc00..1531346 100644
--- a/org.eclipse.jgit.gpg.bc.test/pom.xml
+++ b/org.eclipse.jgit.gpg.bc.test/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.gpg.bc.test</artifactId>
diff --git a/org.eclipse.jgit.gpg.bc/BUILD b/org.eclipse.jgit.gpg.bc/BUILD
index 4fe1e47..9b9ae5f 100644
--- a/org.eclipse.jgit.gpg.bc/BUILD
+++ b/org.eclipse.jgit.gpg.bc/BUILD
@@ -15,6 +15,7 @@
         "//lib:bcpg",
         "//lib:bcpkix",
         "//lib:bcprov",
+        "//lib:bcutil",
         "//lib:slf4j-api",
         "//org.eclipse.jgit:jgit",
     ],
diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
index f1854b0..c766fe1 100644
--- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
@@ -3,35 +3,35 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.gpg.bc
 Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true
-Fragment-Host: org.eclipse.jgit;bundle-version="[5.12.1,5.13.0)"
+Fragment-Host: org.eclipse.jgit;bundle-version="[5.13.0,5.14.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.bouncycastle.asn1;version="[1.65.0,2.0.0)",
- org.bouncycastle.asn1.cryptlib;version="[1.65.0,2.0.0)",
- org.bouncycastle.asn1.x9;version="[1.65.0,2.0.0)",
- org.bouncycastle.bcpg;version="[1.65.0,2.0.0)",
- org.bouncycastle.bcpg.sig;version="[1.65.0,2.0.0)",
- org.bouncycastle.crypto.ec;version="[1.65.0,2.0.0)",
- org.bouncycastle.gpg;version="[1.65.0,2.0.0)",
- org.bouncycastle.gpg.keybox;version="[1.65.0,2.0.0)",
- org.bouncycastle.gpg.keybox.jcajce;version="[1.65.0,2.0.0)",
- org.bouncycastle.jcajce.interfaces;version="[1.65.0,2.0.0)",
- org.bouncycastle.jcajce.util;version="[1.65.0,2.0.0)",
- org.bouncycastle.jce.provider;version="[1.65.0,2.0.0)",
- org.bouncycastle.math.ec;version="[1.65.0,2.0.0)",
- org.bouncycastle.math.field;version="[1.65.0,2.0.0)",
- org.bouncycastle.openpgp;version="[1.65.0,2.0.0)",
- org.bouncycastle.openpgp.jcajce;version="[1.65.0,2.0.0)",
- org.bouncycastle.openpgp.operator;version="[1.65.0,2.0.0)",
- org.bouncycastle.openpgp.operator.jcajce;version="[1.65.0,2.0.0)",
- org.bouncycastle.util;version="[1.65.0,2.0.0)",
- org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)",
- org.bouncycastle.util.io;version="[1.65.0,2.0.0)",
- org.eclipse.jgit.annotations;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)",
+Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)",
+ org.bouncycastle.asn1.cryptlib;version="[1.69.0,2.0.0)",
+ org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)",
+ org.bouncycastle.bcpg;version="[1.69.0,2.0.0)",
+ org.bouncycastle.bcpg.sig;version="[1.69.0,2.0.0)",
+ org.bouncycastle.crypto.ec;version="[1.69.0,2.0.0)",
+ org.bouncycastle.gpg;version="[1.69.0,2.0.0)",
+ org.bouncycastle.gpg.keybox;version="[1.69.0,2.0.0)",
+ org.bouncycastle.gpg.keybox.jcajce;version="[1.69.0,2.0.0)",
+ org.bouncycastle.jcajce.interfaces;version="[1.69.0,2.0.0)",
+ org.bouncycastle.jcajce.util;version="[1.69.0,2.0.0)",
+ org.bouncycastle.jce.provider;version="[1.69.0,2.0.0)",
+ org.bouncycastle.math.ec;version="[1.69.0,2.0.0)",
+ org.bouncycastle.math.field;version="[1.69.0,2.0.0)",
+ org.bouncycastle.openpgp;version="[1.69.0,2.0.0)",
+ org.bouncycastle.openpgp.jcajce;version="[1.69.0,2.0.0)",
+ org.bouncycastle.openpgp.operator;version="[1.69.0,2.0.0)",
+ org.bouncycastle.openpgp.operator.jcajce;version="[1.69.0,2.0.0)",
+ org.bouncycastle.util;version="[1.69.0,2.0.0)",
+ org.bouncycastle.util.encoders;version="[1.69.0,2.0.0)",
+ org.bouncycastle.util.io;version="[1.69.0,2.0.0)",
+ org.eclipse.jgit.annotations;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.api.errors;version="[5.13.0,5.14.0)",
  org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.gpg.bc;version="5.12.1",
- org.eclipse.jgit.gpg.bc.internal;version="5.12.1";x-friends:="org.eclipse.jgit.gpg.bc.test",
- org.eclipse.jgit.gpg.bc.internal.keys;version="5.12.1";x-friends:="org.eclipse.jgit.gpg.bc.test"
+Export-Package: org.eclipse.jgit.gpg.bc;version="5.13.0",
+ org.eclipse.jgit.gpg.bc.internal;version="5.13.0";x-friends:="org.eclipse.jgit.gpg.bc.test",
+ org.eclipse.jgit.gpg.bc.internal.keys;version="5.13.0";x-friends:="org.eclipse.jgit.gpg.bc.test"
diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF
index cd000ba..73198cd 100644
--- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources
 Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.12.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.12.1.qualifier";roots="."
+Bundle-Version: 5.13.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.13.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml
index 8c78f6e..da64bd0 100644
--- a/org.eclipse.jgit.gpg.bc/pom.xml
+++ b/org.eclipse.jgit.gpg.bc/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.gpg.bc</artifactId>
@@ -51,6 +51,11 @@
 
     <dependency>
       <groupId>org.bouncycastle</groupId>
+      <artifactId>bcutil-jdk15on</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
     </dependency>
 
diff --git a/org.eclipse.jgit.gpg.bc/resources/org/eclipse/jgit/gpg/bc/internal/BCText.properties b/org.eclipse.jgit.gpg.bc/resources/org/eclipse/jgit/gpg/bc/internal/BCText.properties
index e4b1bab..ab83298 100644
--- a/org.eclipse.jgit.gpg.bc/resources/org/eclipse/jgit/gpg/bc/internal/BCText.properties
+++ b/org.eclipse.jgit.gpg.bc/resources/org/eclipse/jgit/gpg/bc/internal/BCText.properties
@@ -13,6 +13,8 @@
 gpgNotASigningKey=Secret key ({0}) is not suitable for signing
 gpgKeyInfo=GPG Key (fingerprint {0})
 gpgSigningCancelled=Signing was cancelled
+logWarnGnuPGHome=Cannot access GPG home directory given by environment variable GNUPGHOME={}
+logWarnGpgHomeProperty=Cannot access GPG home directory given by Java system property jgit.gpg.home={}
 nonSignatureError=Signature does not decode into a signature object
 secretKeyTooShort=Secret key file corrupt; only {0} bytes read
 sexprHexNotClosed=Hex number in s-expression not closed
diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BCText.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BCText.java
index aedf8a5..68ee2fd 100644
--- a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BCText.java
+++ b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BCText.java
@@ -42,6 +42,8 @@ public static BCText get() {
 	/***/ public String gpgNotASigningKey;
 	/***/ public String gpgKeyInfo;
 	/***/ public String gpgSigningCancelled;
+	/***/ public String logWarnGnuPGHome;
+	/***/ public String logWarnGpgHomeProperty;
 	/***/ public String nonSignatureError;
 	/***/ public String secretKeyTooShort;
 	/***/ public String sexprHexNotClosed;
diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgKeyLocator.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgKeyLocator.java
index cf4d3d2..8cd03bd 100644
--- a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgKeyLocator.java
+++ b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgKeyLocator.java
@@ -29,6 +29,8 @@
 import java.text.MessageFormat;
 import java.util.Iterator;
 import java.util.Locale;
+import java.util.function.Consumer;
+import java.util.function.Function;
 
 import org.bouncycastle.gpg.keybox.BlobType;
 import org.bouncycastle.gpg.keybox.KeyBlob;
@@ -98,29 +100,54 @@ private static class NoOpenPgpKeyException extends Exception {
 
 	private static Path findGpgDirectory() {
 		SystemReader system = SystemReader.getInstance();
+		Function<String, Path> resolveTilde = s -> {
+			if (s.startsWith("~/") || s.startsWith("~" + File.separatorChar)) { //$NON-NLS-1$ //$NON-NLS-2$
+				return new File(FS.DETECTED.userHome(), s.substring(2))
+						.getAbsoluteFile().toPath();
+			}
+			return Paths.get(s);
+		};
+		Path path = checkDirectory(system.getProperty("jgit.gpg.home"), //$NON-NLS-1$
+				resolveTilde,
+				s -> log.warn(BCText.get().logWarnGpgHomeProperty, s));
+		if (path != null) {
+			return path;
+		}
+		path = checkDirectory(system.getenv("GNUPGHOME"), resolveTilde, //$NON-NLS-1$
+				s -> log.warn(BCText.get().logWarnGnuPGHome, s));
+		if (path != null) {
+			return path;
+		}
 		if (system.isWindows()) {
 			// On Windows prefer %APPDATA%\gnupg if it exists, even if Cygwin is
 			// used.
-			String appData = system.getenv("APPDATA"); //$NON-NLS-1$
-			if (appData != null && !appData.isEmpty()) {
-				try {
-					Path directory = Paths.get(appData).resolve("gnupg"); //$NON-NLS-1$
-					if (Files.isDirectory(directory)) {
-						return directory;
-					}
-				} catch (SecurityException | InvalidPathException e) {
-					// Ignore and return the default location below.
-				}
+			path = checkDirectory(system.getenv("APPDATA"), //$NON-NLS-1$
+					s -> Paths.get(s).resolve("gnupg"), null); //$NON-NLS-1$
+			if (path != null) {
+				return path;
 			}
 		}
 		// All systems, including Cygwin and even Windows if
 		// %APPDATA%\gnupg doesn't exist: ~/.gnupg
-		File home = FS.DETECTED.userHome();
-		if (home == null) {
-			// Oops. What now?
-			home = new File(".").getAbsoluteFile(); //$NON-NLS-1$
+		return resolveTilde.apply("~/.gnupg"); //$NON-NLS-1$
+	}
+
+	private static Path checkDirectory(String dir,
+			Function<String, Path> toPath, Consumer<String> warn) {
+		if (!StringUtils.isEmptyOrNull(dir)) {
+			try {
+				Path directory = toPath.apply(dir);
+				if (Files.isDirectory(directory)) {
+					return directory;
+				}
+			} catch (SecurityException | InvalidPathException e) {
+				// Ignore, warn, and try other known directories
+			}
+			if (warn != null) {
+				warn.accept(dir);
+			}
 		}
-		return home.toPath().resolve(".gnupg"); //$NON-NLS-1$
+		return null;
 	}
 
 	/**
diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java
index 211bd7b..763b7f7 100644
--- a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java
+++ b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java
@@ -195,7 +195,7 @@ public void signObject(@NonNull ObjectBuilder object,
 				}
 			}
 			if (userId != null) {
-				subpackets.setSignerUserID(false, userId);
+				subpackets.addSignerUserID(false, userId);
 			}
 			signatureGenerator
 					.setHashedSubpackets(subpackets.generate());
diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
index 69799a9..2c1e4ff 100644
--- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.http.apache
 Bundle-SymbolicName: org.eclipse.jgit.http.apache
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
@@ -25,11 +25,11 @@
  org.apache.http.impl.conn;version="[4.4.0,5.0.0)",
  org.apache.http.params;version="[4.3.0,5.0.0)",
  org.apache.http.ssl;version="[4.3.0,5.0.0)",
- org.eclipse.jgit.annotations;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.nls;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport.http;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util;version="[5.12.1,5.13.0)"
-Export-Package: org.eclipse.jgit.transport.http.apache;version="5.12.1";
+ org.eclipse.jgit.annotations;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport.http;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util;version="[5.13.0,5.14.0)"
+Export-Package: org.eclipse.jgit.transport.http.apache;version="5.13.0";
   uses:="org.apache.http.client,
    org.eclipse.jgit.transport.http,
    org.apache.http.entity,
diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF
index 0210cf6..7d27ade 100644
--- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.http.apache - Sources
 Bundle-SymbolicName: org.eclipse.jgit.http.apache.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.12.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.12.1.qualifier";roots="."
+Bundle-Version: 5.13.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.13.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml
index b3fb85d..30afcc4 100644
--- a/org.eclipse.jgit.http.apache/pom.xml
+++ b/org.eclipse.jgit.http.apache/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.http.apache</artifactId>
diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
index c20a9e0..1fec9f4 100644
--- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.http.server
 Bundle-SymbolicName: org.eclipse.jgit.http.server
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.http.server;version="5.12.1",
- org.eclipse.jgit.http.server.glue;version="5.12.1";
+Export-Package: org.eclipse.jgit.http.server;version="5.13.0",
+ org.eclipse.jgit.http.server.glue;version="5.13.0";
   uses:="javax.servlet,javax.servlet.http",
- org.eclipse.jgit.http.server.resolver;version="5.12.1";
+ org.eclipse.jgit.http.server.resolver;version="5.13.0";
   uses:="org.eclipse.jgit.transport.resolver,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.transport,
@@ -18,14 +18,14 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
  javax.servlet.http;version="[2.5.0,3.2.0)",
- org.eclipse.jgit.annotations;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.transport.parser;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lib;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.nls;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport.resolver;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util;version="[5.12.1,5.13.0)"
+ org.eclipse.jgit.annotations;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.transport.parser;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util;version="[5.13.0,5.14.0)"
diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF
index 856f91e..af642d7 100644
--- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.http.server - Sources
 Bundle-SymbolicName: org.eclipse.jgit.http.server.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.12.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.12.1.qualifier";roots="."
+Bundle-Version: 5.13.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.13.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml
index f142173..8125d27 100644
--- a/org.eclipse.jgit.http.server/pom.xml
+++ b/org.eclipse.jgit.http.server/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.http.server</artifactId>
diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index b8a653d..210b28f 100644
--- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.http.test
 Bundle-SymbolicName: org.eclipse.jgit.http.test
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -28,30 +28,29 @@
  org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)",
  org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)",
  org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)",
- org.eclipse.jgit.api;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.http.server;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.http.server.glue;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.http.server.resolver;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.junit;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.junit.http;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lib;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.nls;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.storage.file;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport.http;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport.http.apache;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport.resolver;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util;version="[5.12.1,5.13.0)",
- org.hamcrest;version="[1.1.0,2.0.0)",
- org.hamcrest.core;version="[1.1.0,2.0.0)",
+ org.eclipse.jgit.api;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.http.server;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.http.server.glue;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.http.server.resolver;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.junit;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.junit.http;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.storage.file;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport.http;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport.http.apache;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+ org.hamcrest;version="[1.1.0,3.0.0)",
+ org.hamcrest.core;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.rules;version="[4.13,5.0.0)",
  org.junit.runner;version="[4.13,5.0.0)",
  org.junit.runners;version="[4.13,5.0.0)"
-Require-Bundle: org.hamcrest.library;bundle-version="[1.1.0,2.0.0)"
diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml
index 67b4012..0ecc883 100644
--- a/org.eclipse.jgit.http.test/pom.xml
+++ b/org.eclipse.jgit.http.test/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.http.test</artifactId>
@@ -52,9 +52,9 @@
 
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
+      <artifactId>hamcrest</artifactId>
       <scope>test</scope>
-      <version>[1.1.0,2.0.0)</version>
+      <version>${hamcrest-version}</version>
     </dependency>
 
     <dependency>
diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
index b5e6ff3..d715806 100644
--- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.junit.http
 Bundle-SymbolicName: org.eclipse.jgit.junit.http
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
@@ -22,16 +22,16 @@
  org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)",
  org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)",
  org.eclipse.jetty.util.ssl;version="[9.4.5,10.0.0)",
- org.eclipse.jgit.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.http.server;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.junit;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lib;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport.resolver;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.http.server;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.junit;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.13.0,5.14.0)",
  org.junit;version="[4.13,5.0.0)"
-Export-Package: org.eclipse.jgit.junit.http;version="5.12.1";
+Export-Package: org.eclipse.jgit.junit.http;version="5.13.0";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.junit,
    javax.servlet.http,
diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF
index d9204d3..4ed1549 100644
--- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.junit.http - Sources
 Bundle-SymbolicName: org.eclipse.jgit.junit.http.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.12.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.12.1.qualifier";roots="."
+Bundle-Version: 5.13.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.13.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml
index b155ff3..d7202f8 100644
--- a/org.eclipse.jgit.junit.http/pom.xml
+++ b/org.eclipse.jgit.junit.http/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.junit.http</artifactId>
diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
index b777174..83fc93e 100644
--- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
@@ -3,46 +3,46 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.junit.ssh
 Bundle-SymbolicName: org.eclipse.jgit.junit.ssh
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.apache.sshd.common;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.config.keys;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.file.virtualfs;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.helpers;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.io;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.kex;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.keyprovider;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.session;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.signature;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.util.buffer;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.util.logging;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.util.security;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.util.threads;version="[2.6.0,2.7.0)",
- org.apache.sshd.core;version="[2.6.0,2.7.0)",
- org.apache.sshd.server;version="[2.6.0,2.7.0)",
- org.apache.sshd.server.auth;version="[2.6.0,2.7.0)",
- org.apache.sshd.server.auth.gss;version="[2.6.0,2.7.0)",
- org.apache.sshd.server.auth.keyboard;version="[2.6.0,2.7.0)",
- org.apache.sshd.server.auth.password;version="[2.6.0,2.7.0)",
- org.apache.sshd.server.command;version="[2.6.0,2.7.0)",
- org.apache.sshd.server.session;version="[2.6.0,2.7.0)",
- org.apache.sshd.server.shell;version="[2.6.0,2.7.0)",
- org.apache.sshd.server.subsystem;version="[2.6.0,2.7.0)",
- org.apache.sshd.sftp;version="[2.6.0,2.7.0)",
- org.apache.sshd.sftp.server;version="[2.6.0,2.7.0)",
- org.eclipse.jgit.annotations;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.api;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.junit;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lib;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util;version="[5.12.1,5.13.0)",
+Import-Package: org.apache.sshd.common;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.config.keys;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.file.virtualfs;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.helpers;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.io;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.kex;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.keyprovider;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.session;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.signature;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.buffer;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.logging;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.security;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.threads;version="[2.7.0,2.8.0)",
+ org.apache.sshd.core;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server.auth;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server.auth.gss;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server.auth.keyboard;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server.auth.password;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server.command;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server.session;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server.shell;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server.subsystem;version="[2.7.0,2.8.0)",
+ org.apache.sshd.sftp;version="[2.7.0,2.8.0)",
+ org.apache.sshd.sftp.server;version="[2.7.0,2.8.0)",
+ org.eclipse.jgit.annotations;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.api;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.api.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.junit;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.experimental.theories;version="[4.13,5.0.0)",
  org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.junit.ssh;version="5.12.1"
+Export-Package: org.eclipse.jgit.junit.ssh;version="5.13.0"
diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF
index eb562a0..32d199c 100644
--- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources
 Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.12.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.12.1.qualifier";roots="."
+Bundle-Version: 5.13.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.13.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml
index efec573..e406c74 100644
--- a/org.eclipse.jgit.junit.ssh/pom.xml
+++ b/org.eclipse.jgit.junit.ssh/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.junit.ssh</artifactId>
diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
index fa61ce2..4ebbc22 100644
--- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
@@ -3,35 +3,35 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.junit
 Bundle-SymbolicName: org.eclipse.jgit.junit
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.jgit.annotations;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.api;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.dircache;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.pack;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lib;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.merge;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.storage.file;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport;version="5.12.1",
- org.eclipse.jgit.treewalk;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util.io;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util.time;version="[5.12.1,5.13.0)",
+Import-Package: org.eclipse.jgit.annotations;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.api;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.api.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.dircache;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.merge;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.storage.file;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport;version="5.13.0",
+ org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util.io;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util.time;version="[5.13.0,5.14.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.rules;version="[4.13,5.0.0)",
  org.junit.runner;version="[4.13,5.0.0)",
  org.junit.runners;version="[4.13,5.0.0)",
  org.junit.runners.model;version="[4.13,5.0.0)",
  org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.junit;version="5.12.1";
+Export-Package: org.eclipse.jgit.junit;version="5.13.0";
   uses:="org.eclipse.jgit.dircache,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
@@ -44,4 +44,4 @@
    org.junit.runners.model,
    org.junit.runner,
    org.eclipse.jgit.util.time",
- org.eclipse.jgit.junit.time;version="5.12.1";uses:="org.eclipse.jgit.util.time"
+ org.eclipse.jgit.junit.time;version="5.13.0";uses:="org.eclipse.jgit.util.time"
diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF
index a4b46e4..d75622b 100644
--- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.junit - Sources
 Bundle-SymbolicName: org.eclipse.jgit.junit.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.12.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.12.1.qualifier";roots="."
+Bundle-Version: 5.13.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.13.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml
index 884abf0..fc6544e 100644
--- a/org.eclipse.jgit.junit/pom.xml
+++ b/org.eclipse.jgit.junit/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.junit</artifactId>
diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
index 296ff9e..b10bf8c 100644
--- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.lfs.server.test
 Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -28,25 +28,25 @@
  org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)",
  org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)",
  org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)",
- org.eclipse.jgit.api;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.junit;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.junit.http;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lfs;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lfs.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lfs.lib;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lfs.server;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lfs.server.fs;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lfs.test;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lib;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.storage.file;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.treewalk;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util;version="[5.12.1,5.13.0)",
- org.hamcrest.core;version="[1.1.0,2.0.0)",
+ org.eclipse.jgit.api;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.api.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.junit;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.junit.http;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lfs;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lfs.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lfs.lib;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lfs.server;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lfs.server.fs;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lfs.test;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.storage.file;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+ org.hamcrest.core;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.rules;version="[4.13,5.0.0)",
  org.junit.runner;version="[4.13,5.0.0)",
diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml
index 318f74e..12d87b2 100644
--- a/org.eclipse.jgit.lfs.server.test/pom.xml
+++ b/org.eclipse.jgit.lfs.server.test/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.lfs.server.test</artifactId>
diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
index 1596feb..fea47b5 100644
--- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
@@ -3,19 +3,19 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.lfs.server
 Bundle-SymbolicName: org.eclipse.jgit.lfs.server
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.lfs.server;version="5.12.1";
+Export-Package: org.eclipse.jgit.lfs.server;version="5.13.0";
   uses:="javax.servlet.http,
    org.eclipse.jgit.lfs.lib",
- org.eclipse.jgit.lfs.server.fs;version="5.12.1";
+ org.eclipse.jgit.lfs.server.fs;version="5.13.0";
   uses:="javax.servlet,
    javax.servlet.http,
    org.eclipse.jgit.lfs.server,
    org.eclipse.jgit.lfs.lib",
- org.eclipse.jgit.lfs.server.internal;version="5.12.1";x-internal:=true,
- org.eclipse.jgit.lfs.server.s3;version="5.12.1";
+ org.eclipse.jgit.lfs.server.internal;version="5.13.0";x-internal:=true,
+ org.eclipse.jgit.lfs.server.s3;version="5.13.0";
   uses:="org.eclipse.jgit.lfs.server,
    org.eclipse.jgit.lfs.lib"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -24,15 +24,15 @@
  javax.servlet.annotation;version="[3.1.0,4.0.0)",
  javax.servlet.http;version="[3.1.0,4.0.0)",
  org.apache.http;version="[4.3.0,5.0.0)",
- org.eclipse.jgit.annotations;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lfs.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lfs.internal;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lfs.lib;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lib;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.nls;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport.http;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport.http.apache;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.annotations;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lfs.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lfs.internal;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lfs.lib;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport.http;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport.http.apache;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
  org.slf4j;version="[1.7.0,2.0.0)"
diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF
index 5e4ae52..c940f2f 100644
--- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.lfs.server - Sources
 Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.12.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.12.1.qualifier";roots="."
+Bundle-Version: 5.13.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.13.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml
index 02d70fb..ced9532 100644
--- a/org.eclipse.jgit.lfs.server/pom.xml
+++ b/org.eclipse.jgit.lfs.server/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.lfs.server</artifactId>
diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
index 7399ba1..cd13fe5 100644
--- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
@@ -3,24 +3,24 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.lfs.test
 Bundle-SymbolicName: org.eclipse.jgit.lfs.test
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.jgit.api;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.attributes;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.junit;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lfs;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lfs.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lfs.lib;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lib;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.treewalk;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util;version="[5.12.1,5.13.0)",
- org.hamcrest.core;version="[1.1.0,2.0.0)",
+Import-Package: org.eclipse.jgit.api;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.attributes;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.junit;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lfs;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lfs.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lfs.lib;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+ org.hamcrest.core;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.runner;version="[4.13,5.0.0)",
  org.junit.runners;version="[4.13,5.0.0)"
-Export-Package: org.eclipse.jgit.lfs.test;version="5.12.1";x-friends:="org.eclipse.jgit.lfs.server.test"
+Export-Package: org.eclipse.jgit.lfs.test;version="5.13.0";x-friends:="org.eclipse.jgit.lfs.server.test"
diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml
index 5e58aa5..0aac35c 100644
--- a/org.eclipse.jgit.lfs.test/pom.xml
+++ b/org.eclipse.jgit.lfs.test/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.lfs.test</artifactId>
diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
index db8247a..ced80e7 100644
--- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
@@ -3,31 +3,31 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.lfs
 Bundle-SymbolicName: org.eclipse.jgit.lfs
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.lfs;version="5.12.1",
- org.eclipse.jgit.lfs.errors;version="5.12.1",
- org.eclipse.jgit.lfs.internal;version="5.12.1";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server",
- org.eclipse.jgit.lfs.lib;version="5.12.1"
+Export-Package: org.eclipse.jgit.lfs;version="5.13.0",
+ org.eclipse.jgit.lfs.errors;version="5.13.0",
+ org.eclipse.jgit.lfs.internal;version="5.13.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server",
+ org.eclipse.jgit.lfs.lib;version="5.13.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.gson;version="[2.8.0,3.0.0)",
  com.google.gson.stream;version="[2.8.0,3.0.0)",
- org.eclipse.jgit.annotations;version="[5.12.1,5.13.0)";resolution:=optional,
- org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.attributes;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.diff;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.hooks;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lib;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.nls;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.storage.file;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.storage.pack;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport.http;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.treewalk;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util.io;version="[5.12.1,5.13.0)"
+ org.eclipse.jgit.annotations;version="[5.13.0,5.14.0)";resolution:=optional,
+ org.eclipse.jgit.api.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.attributes;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.diff;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.hooks;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.storage.file;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.storage.pack;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport.http;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util.io;version="[5.13.0,5.14.0)"
diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF
index 9aca20a..4cf367a 100644
--- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.lfs - Sources
 Bundle-SymbolicName: org.eclipse.jgit.lfs.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.12.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.12.1.qualifier";roots="."
+Bundle-Version: 5.13.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.13.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml
index 505d0e9..ead51e1 100644
--- a/org.eclipse.jgit.lfs/pom.xml
+++ b/org.eclipse.jgit.lfs/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.lfs</artifactId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
index ed16046..59700d8 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit"
       label="%featureName"
-      version="5.12.1.qualifier"
+      version="5.13.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
index 6e0d1df..52fef69 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml
index d148646..4917822 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.gpg.bc"
       label="%featureName"
-      version="5.12.1.qualifier"
+      version="5.13.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.jgit" version="5.12.1" match="equivalent"/>
+      <import plugin="org.eclipse.jgit" version="5.13.0" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml
index 59863ee..473979b 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
index d392f13..af252d3 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.http.apache"
       label="%featureName"
-      version="5.12.1.qualifier"
+      version="5.13.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.jgit" version="5.12.1" match="equivalent"/>
+      <import plugin="org.eclipse.jgit" version="5.13.0" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
index dc4f3ec..2e7831a 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
index a3730b7..2e936bc 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.junit"
       label="%featureName"
-      version="5.12.1.qualifier"
+      version="5.13.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -24,7 +24,7 @@
 
    <requires>
       <import plugin="com.jcraft.jsch"/>
-      <import plugin="org.eclipse.jgit" version="5.12.1" match="equivalent"/>
+      <import plugin="org.eclipse.jgit" version="5.13.0" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
index 5717376..0a279e3 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
index bfaa0fa..eb95bdd 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.lfs"
       label="%featureName"
-      version="5.12.1.qualifier"
+      version="5.13.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.jgit" version="5.12.1" match="equivalent"/>
+      <import feature="org.eclipse.jgit" version="5.13.0" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml
index 3e34991..9a2d725 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
index 46556f6..56cd133 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.pgm"
       label="%featureName"
-      version="5.12.1.qualifier"
+      version="5.13.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -35,9 +35,9 @@
          version="0.0.0"/>
 
    <requires>
-      <import feature="org.eclipse.jgit" version="5.12.1" match="equivalent"/>
-      <import feature="org.eclipse.jgit.lfs" version="5.12.1" match="equivalent"/>
-      <import feature="org.eclipse.jgit.ssh.apache" version="5.12.1" match="equivalent"/>
+      <import feature="org.eclipse.jgit" version="5.13.0" match="equivalent"/>
+      <import feature="org.eclipse.jgit.lfs" version="5.13.0" match="equivalent"/>
+      <import feature="org.eclipse.jgit.ssh.apache" version="5.13.0" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
index 2ba4119..04f31a6 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
index 68781c1..4ed82c8 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.repository</artifactId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml
index 3607076..de63500 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.source"
       label="%featureName"
-      version="5.12.1.qualifier"
+      version="5.13.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.jgit" version="5.12.1" match="equivalent"/>
+      <import feature="org.eclipse.jgit" version="5.13.0" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml
index fb3fcad..4ea10bf 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>org.eclipse.jgit.feature</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
-      <version>5.12.1-SNAPSHOT</version>
+      <version>5.13.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml
index d748508..42d6f9c 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.ssh.apache"
       label="%featureName"
-      version="5.12.1.qualifier"
+      version="5.13.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.jgit" version="5.12.1" match="equivalent"/>
+      <import feature="org.eclipse.jgit" version="5.13.0" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml
index a9cd770..d5e9fd7 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml
index 8147102..902f18b 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.ssh.jsch"
       label="%featureName"
-      version="5.12.1.qualifier"
+      version="5.13.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.jgit" version="5.12.1" match="equivalent"/>
+      <import plugin="org.eclipse.jgit" version="5.13.0" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml
index dcf998f..179825f 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF
index 92d1ade..74c0d3f 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF
@@ -2,4 +2,4 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: JGit Target Platform Bundle
 Bundle-SymbolicName: org.eclipse.jgit.target
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
index 8cc851d..f48b939 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.10" sequenceNumber="1623012846">
+<target name="jgit-4.10" sequenceNumber="1630003272">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/>
-      <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/>
+      <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
+      <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
-      <unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
+      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
+      <unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
       <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
-      <unit id="javaewah" version="1.1.7.v20200107-0831"/>
-      <unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
+      <unit id="javaewah" version="1.1.12.v20210622-2206"/>
+      <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
       <unit id="javax.servlet" version="3.1.0.v201410161800"/>
       <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
@@ -41,12 +41,12 @@
       <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
       <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
       <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
-      <unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
-      <unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
+      <unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
+      <unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
       <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
       <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
-      <unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
-      <unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
+      <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+      <unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
       <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
@@ -55,19 +55,22 @@
       <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
-      <unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.assertj" version="3.14.0.v20200120-1926"/>
-      <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
-      <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
-      <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.assertj" version="3.20.2.v20210706-1104"/>
+      <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
+      <unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
+      <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
@@ -84,9 +87,9 @@
       <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
       <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
-      <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
-      <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+      <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
+      <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.osgi" version="0.0.0"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd
index 6ba77b9..9eaf687 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd
@@ -1,7 +1,7 @@
 target "jgit-4.10" with source configurePhase
 
 include "projects/jetty-9.4.x.tpd"
-include "orbit/R20210602031627-2021-06.tpd"
+include "orbit/R20210825222808-2021-09.tpd"
 
 location "https://download.eclipse.org/releases/2018-12/" {
 	org.eclipse.osgi lazy
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target
index 164cd82..55454cc 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.11" sequenceNumber="1623012873">
+<target name="jgit-4.11" sequenceNumber="1630003272">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/>
-      <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/>
+      <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
+      <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
-      <unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
+      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
+      <unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
       <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
-      <unit id="javaewah" version="1.1.7.v20200107-0831"/>
-      <unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
+      <unit id="javaewah" version="1.1.12.v20210622-2206"/>
+      <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
       <unit id="javax.servlet" version="3.1.0.v201410161800"/>
       <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
@@ -41,12 +41,12 @@
       <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
       <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
       <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
-      <unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
-      <unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
+      <unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
+      <unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
       <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
       <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
-      <unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
-      <unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
+      <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+      <unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
       <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
@@ -55,19 +55,22 @@
       <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
-      <unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.assertj" version="3.14.0.v20200120-1926"/>
-      <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
-      <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
-      <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.assertj" version="3.20.2.v20210706-1104"/>
+      <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
+      <unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
+      <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
@@ -84,9 +87,9 @@
       <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
       <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
-      <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
-      <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+      <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
+      <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.osgi" version="0.0.0"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.tpd
index f29a9fe..d471288 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.tpd
@@ -1,7 +1,7 @@
 target "jgit-4.11" with source configurePhase
 
 include "projects/jetty-9.4.x.tpd"
-include "orbit/R20210602031627-2021-06.tpd"
+include "orbit/R20210825222808-2021-09.tpd"
 
 location "https://download.eclipse.org/releases/2019-03/" {
 	org.eclipse.osgi lazy
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target
index ed8ad0b..bf2623b 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.12" sequenceNumber="1623012873">
+<target name="jgit-4.12" sequenceNumber="1630003272">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/>
-      <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/>
+      <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
+      <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
-      <unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
+      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
+      <unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
       <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
-      <unit id="javaewah" version="1.1.7.v20200107-0831"/>
-      <unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
+      <unit id="javaewah" version="1.1.12.v20210622-2206"/>
+      <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
       <unit id="javax.servlet" version="3.1.0.v201410161800"/>
       <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
@@ -41,12 +41,12 @@
       <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
       <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
       <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
-      <unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
-      <unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
+      <unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
+      <unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
       <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
       <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
-      <unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
-      <unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
+      <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+      <unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
       <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
@@ -55,19 +55,22 @@
       <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
-      <unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.assertj" version="3.14.0.v20200120-1926"/>
-      <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
-      <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
-      <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.assertj" version="3.20.2.v20210706-1104"/>
+      <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
+      <unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
+      <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
@@ -84,9 +87,9 @@
       <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
       <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
-      <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
-      <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+      <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
+      <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.osgi" version="0.0.0"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.tpd
index 35bf3b0..9fbe578 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.tpd
@@ -1,7 +1,7 @@
 target "jgit-4.12" with source configurePhase
 
 include "projects/jetty-9.4.x.tpd"
-include "orbit/R20210602031627-2021-06.tpd"
+include "orbit/R20210825222808-2021-09.tpd"
 
 location "https://download.eclipse.org/releases/2019-06/" {
 	org.eclipse.osgi lazy
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target
index 993e112..2aef11f 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.13" sequenceNumber="1623012873">
+<target name="jgit-4.13" sequenceNumber="1630003272">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/>
-      <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/>
+      <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
+      <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
-      <unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
+      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
+      <unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
       <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
-      <unit id="javaewah" version="1.1.7.v20200107-0831"/>
-      <unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
+      <unit id="javaewah" version="1.1.12.v20210622-2206"/>
+      <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
       <unit id="javax.servlet" version="3.1.0.v201410161800"/>
       <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
@@ -41,12 +41,12 @@
       <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
       <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
       <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
-      <unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
-      <unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
+      <unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
+      <unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
       <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
       <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
-      <unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
-      <unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
+      <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+      <unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
       <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
@@ -55,19 +55,22 @@
       <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
-      <unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.assertj" version="3.14.0.v20200120-1926"/>
-      <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
-      <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
-      <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.assertj" version="3.20.2.v20210706-1104"/>
+      <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
+      <unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
+      <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
@@ -84,9 +87,9 @@
       <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
       <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
-      <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
-      <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+      <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
+      <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.osgi" version="0.0.0"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.tpd
index 6da9b00..e081cbb 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.tpd
@@ -1,7 +1,7 @@
 target "jgit-4.13" with source configurePhase
 
 include "projects/jetty-9.4.x.tpd"
-include "orbit/R20210602031627-2021-06.tpd"
+include "orbit/R20210825222808-2021-09.tpd"
 
 location "https://download.eclipse.org/releases/2019-09/" {
 	org.eclipse.osgi lazy
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target
index e8cfa60..6db7e9d 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.14" sequenceNumber="1623012870">
+<target name="jgit-4.14" sequenceNumber="1630003272">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/>
-      <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/>
+      <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
+      <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
-      <unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
+      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
+      <unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
       <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
-      <unit id="javaewah" version="1.1.7.v20200107-0831"/>
-      <unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
+      <unit id="javaewah" version="1.1.12.v20210622-2206"/>
+      <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
       <unit id="javax.servlet" version="3.1.0.v201410161800"/>
       <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
@@ -41,12 +41,12 @@
       <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
       <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
       <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
-      <unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
-      <unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
+      <unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
+      <unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
       <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
       <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
-      <unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
-      <unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
+      <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+      <unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
       <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
@@ -55,19 +55,22 @@
       <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
-      <unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.assertj" version="3.14.0.v20200120-1926"/>
-      <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
-      <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
-      <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.assertj" version="3.20.2.v20210706-1104"/>
+      <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
+      <unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
+      <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
@@ -84,9 +87,9 @@
       <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
       <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
-      <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
-      <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+      <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
+      <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.osgi" version="0.0.0"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.tpd
index 70dce0c..5816f23 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.tpd
@@ -1,7 +1,7 @@
 target "jgit-4.14" with source configurePhase
 
 include "projects/jetty-9.4.x.tpd"
-include "orbit/R20210602031627-2021-06.tpd"
+include "orbit/R20210825222808-2021-09.tpd"
 
 location "https://download.eclipse.org/releases/2019-12/201912181000/" {
 	org.eclipse.osgi lazy
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target
index 81c6450..fa0bfad 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.15" sequenceNumber="1623012870">
+<target name="jgit-4.15" sequenceNumber="1630003272">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/>
-      <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/>
+      <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
+      <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
-      <unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
+      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
+      <unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
       <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
-      <unit id="javaewah" version="1.1.7.v20200107-0831"/>
-      <unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
+      <unit id="javaewah" version="1.1.12.v20210622-2206"/>
+      <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
       <unit id="javax.servlet" version="3.1.0.v201410161800"/>
       <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
@@ -41,12 +41,12 @@
       <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
       <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
       <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
-      <unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
-      <unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
+      <unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
+      <unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
       <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
       <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
-      <unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
-      <unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
+      <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+      <unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
       <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
@@ -55,19 +55,22 @@
       <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
-      <unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.assertj" version="3.14.0.v20200120-1926"/>
-      <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
-      <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
-      <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.assertj" version="3.20.2.v20210706-1104"/>
+      <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
+      <unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
+      <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
@@ -84,9 +87,9 @@
       <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
       <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
-      <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
-      <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+      <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
+      <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.osgi" version="0.0.0"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.tpd
index edf5cec..b7f032a 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.tpd
@@ -1,7 +1,7 @@
 target "jgit-4.15" with source configurePhase
 
 include "projects/jetty-9.4.x.tpd"
-include "orbit/R20210602031627-2021-06.tpd"
+include "orbit/R20210825222808-2021-09.tpd"
 
 location "https://download.eclipse.org/releases/2020-03/202003181000/" {
 	org.eclipse.osgi lazy
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.target
index 3afc3b8..86418cf 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.target
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.16" sequenceNumber="1623012874">
+<target name="jgit-4.16" sequenceNumber="1630003272">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/>
-      <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/>
+      <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
+      <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
-      <unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
+      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
+      <unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
       <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
-      <unit id="javaewah" version="1.1.7.v20200107-0831"/>
-      <unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
+      <unit id="javaewah" version="1.1.12.v20210622-2206"/>
+      <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
       <unit id="javax.servlet" version="3.1.0.v201410161800"/>
       <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
@@ -41,12 +41,12 @@
       <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
       <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
       <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
-      <unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
-      <unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
+      <unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
+      <unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
       <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
       <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
-      <unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
-      <unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
+      <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+      <unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
       <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
@@ -55,19 +55,22 @@
       <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
-      <unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.assertj" version="3.14.0.v20200120-1926"/>
-      <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
-      <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
-      <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.assertj" version="3.20.2.v20210706-1104"/>
+      <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
+      <unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
+      <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
@@ -84,9 +87,9 @@
       <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
       <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
-      <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
-      <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+      <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
+      <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.osgi" version="0.0.0"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.tpd
index 54e8a96..c05f65f 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.tpd
@@ -1,7 +1,7 @@
 target "jgit-4.16" with source configurePhase
 
 include "projects/jetty-9.4.x.tpd"
-include "orbit/R20210602031627-2021-06.tpd"
+include "orbit/R20210825222808-2021-09.tpd"
 
 location "https://download.eclipse.org/releases/2020-06/" {
 	org.eclipse.osgi lazy
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target
index f61261f..1258ce7 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.17" sequenceNumber="1623012875">
+<target name="jgit-4.17" sequenceNumber="1630003272">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/>
-      <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/>
+      <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
+      <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
-      <unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
+      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
+      <unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
       <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
-      <unit id="javaewah" version="1.1.7.v20200107-0831"/>
-      <unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
+      <unit id="javaewah" version="1.1.12.v20210622-2206"/>
+      <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
       <unit id="javax.servlet" version="3.1.0.v201410161800"/>
       <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
@@ -41,12 +41,12 @@
       <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
       <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
       <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
-      <unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
-      <unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
+      <unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
+      <unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
       <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
       <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
-      <unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
-      <unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
+      <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+      <unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
       <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
@@ -55,19 +55,22 @@
       <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
-      <unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.assertj" version="3.14.0.v20200120-1926"/>
-      <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
-      <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
-      <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.assertj" version="3.20.2.v20210706-1104"/>
+      <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
+      <unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
+      <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
@@ -84,9 +87,9 @@
       <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
       <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
-      <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
-      <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+      <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
+      <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.osgi" version="0.0.0"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.tpd
index 2b2af1a..bab33ba 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.tpd
@@ -1,7 +1,7 @@
 target "jgit-4.17" with source configurePhase
 
 include "projects/jetty-9.4.x.tpd"
-include "orbit/R20210602031627-2021-06.tpd"
+include "orbit/R20210825222808-2021-09.tpd"
 
 location "https://download.eclipse.org/releases/2020-09/" {
 	org.eclipse.osgi lazy
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target
index c17c1c8..75dbb54 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.18" sequenceNumber="1623012874">
+<target name="jgit-4.18" sequenceNumber="1630003272">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/>
-      <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/>
+      <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
+      <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
-      <unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
+      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
+      <unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
       <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
-      <unit id="javaewah" version="1.1.7.v20200107-0831"/>
-      <unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
+      <unit id="javaewah" version="1.1.12.v20210622-2206"/>
+      <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
       <unit id="javax.servlet" version="3.1.0.v201410161800"/>
       <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
@@ -41,12 +41,12 @@
       <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
       <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
       <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
-      <unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
-      <unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
+      <unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
+      <unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
       <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
       <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
-      <unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
-      <unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
+      <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+      <unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
       <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
@@ -55,19 +55,22 @@
       <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
-      <unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.assertj" version="3.14.0.v20200120-1926"/>
-      <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
-      <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
-      <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.assertj" version="3.20.2.v20210706-1104"/>
+      <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
+      <unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
+      <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
@@ -84,9 +87,9 @@
       <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
       <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
-      <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
-      <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+      <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
+      <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.osgi" version="0.0.0"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.tpd
index 0f42bb6..095ea81 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.tpd
@@ -1,7 +1,7 @@
 target "jgit-4.18" with source configurePhase
 
 include "projects/jetty-9.4.x.tpd"
-include "orbit/R20210602031627-2021-06.tpd"
+include "orbit/R20210825222808-2021-09.tpd"
 
 location "https://download.eclipse.org/releases/2020-12/" {
 	org.eclipse.osgi lazy
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target
index 6db7fe1..93d4a3a 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.19-staging" sequenceNumber="1623012870">
+<target name="jgit-4.19-staging" sequenceNumber="1630003272">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/>
-      <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/>
+      <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
+      <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
-      <unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
+      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
+      <unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
       <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
-      <unit id="javaewah" version="1.1.7.v20200107-0831"/>
-      <unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
+      <unit id="javaewah" version="1.1.12.v20210622-2206"/>
+      <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
       <unit id="javax.servlet" version="3.1.0.v201410161800"/>
       <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
@@ -41,12 +41,12 @@
       <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
       <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
       <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
-      <unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
-      <unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
+      <unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
+      <unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
       <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
       <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
-      <unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
-      <unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
+      <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+      <unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
       <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
@@ -55,19 +55,22 @@
       <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
-      <unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.assertj" version="3.14.0.v20200120-1926"/>
-      <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
-      <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
-      <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.assertj" version="3.20.2.v20210706-1104"/>
+      <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
+      <unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
+      <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
@@ -84,9 +87,9 @@
       <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
       <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
-      <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
-      <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+      <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
+      <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.osgi" version="0.0.0"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.tpd
index 5e4305c..52e4570 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.tpd
@@ -1,7 +1,7 @@
 target "jgit-4.19-staging" with source configurePhase
 
 include "projects/jetty-9.4.x.tpd"
-include "orbit/R20210602031627-2021-06.tpd"
+include "orbit/R20210825222808-2021-09.tpd"
 
 location "https://download.eclipse.org/staging/2021-03/" {
 	org.eclipse.osgi lazy
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20-staging.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20-staging.target
deleted file mode 100644
index f256622..0000000
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20-staging.target
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.20-staging" sequenceNumber="1623012876">
-  <locations>
-    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/>
-      <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/>
-    </location>
-    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
-      <unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
-      <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
-      <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
-      <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
-      <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
-      <unit id="javaewah" version="1.1.7.v20200107-0831"/>
-      <unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
-      <unit id="javax.servlet" version="3.1.0.v201410161800"/>
-      <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
-      <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
-      <unit id="net.bytebuddy.byte-buddy-agent" version="1.9.0.v20181106-1534"/>
-      <unit id="net.bytebuddy.byte-buddy-agent.source" version="1.9.0.v20181106-1534"/>
-      <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
-      <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
-      <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
-      <unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
-      <unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
-      <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
-      <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
-      <unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
-      <unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
-      <unit id="org.apache.commons.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.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.assertj" version="3.14.0.v20200120-1926"/>
-      <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
-      <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
-      <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
-      <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
-      <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
-      <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
-      <unit id="org.junit" version="4.13.0.v20200204-1500"/>
-      <unit id="org.junit.source" version="4.13.0.v20200204-1500"/>
-      <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.8.0.v20180207-1613"/>
-      <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
-    </location>
-    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.osgi" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/staging/2021-06/"/>
-    </location>
-  </locations>
-</target>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20-staging.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20-staging.tpd
deleted file mode 100644
index de929b5..0000000
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20-staging.tpd
+++ /dev/null
@@ -1,8 +0,0 @@
-target "jgit-4.20-staging" with source configurePhase
-
-include "projects/jetty-9.4.x.tpd"
-include "orbit/R20210602031627-2021-06.tpd"
-
-location "https://download.eclipse.org/staging/2021-06/" {
-	org.eclipse.osgi lazy
-}
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target
new file mode 100644
index 0000000..ee4f2a0
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="jgit-4.20" sequenceNumber="1630003272">
+  <locations>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
+      <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
+    </location>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
+      <unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
+      <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
+      <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
+      <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
+      <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
+      <unit id="javaewah" version="1.1.12.v20210622-2206"/>
+      <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
+      <unit id="javax.servlet" version="3.1.0.v201410161800"/>
+      <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
+      <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
+      <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.v20181102-1323"/>
+      <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
+      <unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
+      <unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
+      <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
+      <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
+      <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+      <unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
+      <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
+      <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
+      <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
+      <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/>
+      <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
+      <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
+      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+      <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
+      <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.assertj" version="3.20.2.v20210706-1104"/>
+      <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
+      <unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
+      <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
+      <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
+      <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
+      <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
+      <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
+      <unit id="org.junit" version="4.13.0.v20200204-1500"/>
+      <unit id="org.junit.source" version="4.13.0.v20200204-1500"/>
+      <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/R20210825222808/repository"/>
+    </location>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="org.eclipse.osgi" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/releases/2021-06/"/>
+    </location>
+  </locations>
+</target>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.tpd
new file mode 100644
index 0000000..d2cf94f
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.tpd
@@ -0,0 +1,8 @@
+target "jgit-4.20" with source configurePhase
+
+include "projects/jetty-9.4.x.tpd"
+include "orbit/R20210825222808-2021-09.tpd"
+
+location "https://download.eclipse.org/releases/2021-06/" {
+	org.eclipse.osgi lazy
+}
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target
new file mode 100644
index 0000000..e27f6c7
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="jgit-4.21" sequenceNumber="1630003272">
+  <locations>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
+      <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
+    </location>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
+      <unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
+      <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
+      <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
+      <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
+      <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
+      <unit id="javaewah" version="1.1.12.v20210622-2206"/>
+      <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
+      <unit id="javax.servlet" version="3.1.0.v201410161800"/>
+      <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
+      <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
+      <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.v20181102-1323"/>
+      <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
+      <unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
+      <unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
+      <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
+      <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
+      <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+      <unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
+      <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
+      <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
+      <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
+      <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/>
+      <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
+      <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
+      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+      <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
+      <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.assertj" version="3.20.2.v20210706-1104"/>
+      <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
+      <unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
+      <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
+      <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
+      <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
+      <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
+      <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
+      <unit id="org.junit" version="4.13.0.v20200204-1500"/>
+      <unit id="org.junit.source" version="4.13.0.v20200204-1500"/>
+      <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/R20210825222808/repository"/>
+    </location>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="org.eclipse.osgi" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/staging/2021-09/"/>
+    </location>
+  </locations>
+</target>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.tpd
new file mode 100644
index 0000000..9d32469
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.tpd
@@ -0,0 +1,8 @@
+target "jgit-4.21" with source configurePhase
+
+include "projects/jetty-9.4.x.tpd"
+include "orbit/R20210825222808-2021-09.tpd"
+
+location "https://download.eclipse.org/staging/2021-09/" {
+	org.eclipse.osgi lazy
+}
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
index ca1696b..b816092 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.6" sequenceNumber="1623012886">
+<target name="jgit-4.6" sequenceNumber="1630003285">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/>
-      <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/>
+      <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
+      <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
-      <unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
+      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
+      <unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
       <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
-      <unit id="javaewah" version="1.1.7.v20200107-0831"/>
-      <unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
+      <unit id="javaewah" version="1.1.12.v20210622-2206"/>
+      <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
       <unit id="javax.servlet" version="3.1.0.v201410161800"/>
       <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
@@ -41,12 +41,12 @@
       <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
       <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
       <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
-      <unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
-      <unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
+      <unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
+      <unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
       <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
       <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
-      <unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
-      <unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
+      <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+      <unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
       <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
@@ -55,19 +55,22 @@
       <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
-      <unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.assertj" version="3.14.0.v20200120-1926"/>
-      <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
-      <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
-      <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.assertj" version="3.20.2.v20210706-1104"/>
+      <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
+      <unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
+      <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
@@ -84,9 +87,9 @@
       <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
       <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
-      <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
-      <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+      <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
+      <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.osgi" version="0.0.0"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd
index 96a6073..6e706bb 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd
@@ -1,7 +1,7 @@
 target "jgit-4.6" with source configurePhase
 
 include "projects/jetty-9.4.x.tpd"
-include "orbit/R20210602031627-2021-06.tpd"
+include "orbit/R20210825222808-2021-09.tpd"
 
 location "https://download.eclipse.org/releases/neon/" {
 	org.eclipse.osgi lazy
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
index 6098388..4e3a4bc 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.7" sequenceNumber="1623012878">
+<target name="jgit-4.7" sequenceNumber="1630003276">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/>
-      <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/>
+      <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
+      <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
-      <unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
+      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
+      <unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
       <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
-      <unit id="javaewah" version="1.1.7.v20200107-0831"/>
-      <unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
+      <unit id="javaewah" version="1.1.12.v20210622-2206"/>
+      <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
       <unit id="javax.servlet" version="3.1.0.v201410161800"/>
       <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
@@ -41,12 +41,12 @@
       <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
       <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
       <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
-      <unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
-      <unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
+      <unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
+      <unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
       <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
       <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
-      <unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
-      <unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
+      <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+      <unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
       <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
@@ -55,19 +55,22 @@
       <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
-      <unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.assertj" version="3.14.0.v20200120-1926"/>
-      <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
-      <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
-      <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.assertj" version="3.20.2.v20210706-1104"/>
+      <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
+      <unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
+      <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
@@ -84,9 +87,9 @@
       <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
       <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
-      <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
-      <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+      <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
+      <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.osgi" version="0.0.0"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd
index bfb68b2..d675221 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd
@@ -1,7 +1,7 @@
 target "jgit-4.7" with source configurePhase
 
 include "projects/jetty-9.4.x.tpd"
-include "orbit/R20210602031627-2021-06.tpd"
+include "orbit/R20210825222808-2021-09.tpd"
 
 location "https://download.eclipse.org/releases/oxygen/" {
 	org.eclipse.osgi lazy
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
index 180b814..3d4683b 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.8" sequenceNumber="1623012874">
+<target name="jgit-4.8" sequenceNumber="1630003272">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/>
-      <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/>
+      <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
+      <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
-      <unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
+      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
+      <unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
       <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
-      <unit id="javaewah" version="1.1.7.v20200107-0831"/>
-      <unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
+      <unit id="javaewah" version="1.1.12.v20210622-2206"/>
+      <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
       <unit id="javax.servlet" version="3.1.0.v201410161800"/>
       <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
@@ -41,12 +41,12 @@
       <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
       <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
       <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
-      <unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
-      <unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
+      <unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
+      <unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
       <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
       <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
-      <unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
-      <unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
+      <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+      <unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
       <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
@@ -55,19 +55,22 @@
       <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
-      <unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.assertj" version="3.14.0.v20200120-1926"/>
-      <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
-      <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
-      <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.assertj" version="3.20.2.v20210706-1104"/>
+      <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
+      <unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
+      <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
@@ -84,9 +87,9 @@
       <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
       <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
-      <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
-      <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+      <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
+      <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.osgi" version="0.0.0"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd
index e3e6b21..d5f8b38 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd
@@ -1,7 +1,7 @@
 target "jgit-4.8" with source configurePhase
 
 include "projects/jetty-9.4.x.tpd"
-include "orbit/R20210602031627-2021-06.tpd"
+include "orbit/R20210825222808-2021-09.tpd"
 
 location "https://download.eclipse.org/releases/photon/" {
 	org.eclipse.osgi lazy
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target
index 27b3096..de289b6 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.9" sequenceNumber="1623012874">
+<target name="jgit-4.9" sequenceNumber="1630003272">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/>
-      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/>
-      <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/>
+      <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.client.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/>
+      <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/>
+      <repository id="jetty-9.4.x" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
-      <unit id="com.google.gson.source" version="2.8.6.v20201231-1626"/>
+      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
+      <unit id="com.google.gson.source" version="2.8.7.v20210624-1215"/>
       <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
-      <unit id="javaewah" version="1.1.7.v20200107-0831"/>
-      <unit id="javaewah.source" version="1.1.7.v20200107-0831"/>
+      <unit id="javaewah" version="1.1.12.v20210622-2206"/>
+      <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
       <unit id="javax.servlet" version="3.1.0.v201410161800"/>
       <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
@@ -41,12 +41,12 @@
       <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
       <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
       <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
-      <unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
-      <unit id="org.apache.ant.source" version="1.10.10.v20210426-1926"/>
+      <unit id="org.apache.ant" version="1.10.11.v20210720-1445"/>
+      <unit id="org.apache.ant.source" version="1.10.11.v20210720-1445"/>
       <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
       <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
-      <unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
-      <unit id="org.apache.commons.compress.source" version="1.19.0.v20200106-2343"/>
+      <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+      <unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
       <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
       <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
@@ -55,19 +55,22 @@
       <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
-      <unit id="org.apache.sshd.osgi" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.osgi.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp" version="2.6.0.v20210201-2003"/>
-      <unit id="org.apache.sshd.sftp.source" version="2.6.0.v20210201-2003"/>
-      <unit id="org.assertj" version="3.14.0.v20200120-1926"/>
-      <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
-      <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
-      <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
-      <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
+      <unit id="org.apache.sshd.sftp.source" version="2.7.0.v20210623-0618"/>
+      <unit id="org.assertj" version="3.20.2.v20210706-1104"/>
+      <unit id="org.assertj.source" version="3.20.2.v20210706-1104"/>
+      <unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpg.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcpkix.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcprov.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil" version="1.69.0.v20210713-1924"/>
+      <unit id="org.bouncycastle.bcutil.source" version="1.69.0.v20210713-1924"/>
+      <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
+      <unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
       <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
@@ -84,9 +87,9 @@
       <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/>
       <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/>
-      <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
-      <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+      <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
+      <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.osgi" version="0.0.0"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd
index 938d80b..b6a4d6a 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd
@@ -1,7 +1,7 @@
 target "jgit-4.9" with source configurePhase
 
 include "projects/jetty-9.4.x.tpd"
-include "orbit/R20210602031627-2021-06.tpd"
+include "orbit/R20210825222808-2021-09.tpd"
 
 location "https://download.eclipse.org/releases/2018-09/" {
 	org.eclipse.osgi lazy
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20210825222808-2021-09.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20210825222808-2021-09.tpd
new file mode 100644
index 0000000..059a584
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20210825222808-2021-09.tpd
@@ -0,0 +1,69 @@
+target "R20210825222808-2021-09" with source configurePhase
+// see https://download.eclipse.org/tools/orbit/downloads/
+
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository" {
+	com.google.gson [2.8.7.v20210624-1215,2.8.7.v20210624-1215]
+	com.google.gson.source [2.8.7.v20210624-1215,2.8.7.v20210624-1215]
+	com.jcraft.jsch [0.1.55.v20190404-1902,0.1.55.v20190404-1902]
+	com.jcraft.jsch.source [0.1.55.v20190404-1902,0.1.55.v20190404-1902]
+	com.jcraft.jzlib [1.1.1.v201205102305,1.1.1.v201205102305]
+	com.jcraft.jzlib.source [1.1.1.v201205102305,1.1.1.v201205102305]
+	javaewah [1.1.12.v20210622-2206,1.1.12.v20210622-2206]
+	javaewah.source [1.1.12.v20210622-2206,1.1.12.v20210622-2206]
+	javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800]
+	javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800]
+	net.bytebuddy.byte-buddy [1.9.0.v20181107-1410,1.9.0.v20181107-1410]
+	net.bytebuddy.byte-buddy-agent [1.9.0.v20181106-1534,1.9.0.v20181106-1534]
+	net.bytebuddy.byte-buddy-agent.source [1.9.0.v20181106-1534,1.9.0.v20181106-1534]
+	net.bytebuddy.byte-buddy.source [1.9.0.v20181107-1410,1.9.0.v20181107-1410]
+	net.i2p.crypto.eddsa [0.3.0.v20181102-1323,0.3.0.v20181102-1323]
+	net.i2p.crypto.eddsa.source [0.3.0.v20181102-1323,0.3.0.v20181102-1323]
+	org.apache.ant [1.10.11.v20210720-1445,1.10.11.v20210720-1445]
+	org.apache.ant.source [1.10.11.v20210720-1445,1.10.11.v20210720-1445]
+	org.apache.commons.codec [1.14.0.v20200818-1422,1.14.0.v20200818-1422]
+	org.apache.commons.codec.source [1.14.0.v20200818-1422,1.14.0.v20200818-1422]
+	org.apache.commons.compress [1.20.0.v20210713-1928,1.20.0.v20210713-1928]
+	org.apache.commons.compress.source [1.20.0.v20210713-1928,1.20.0.v20210713-1928]
+	org.apache.commons.logging [1.2.0.v20180409-1502,1.2.0.v20180409-1502]
+	org.apache.commons.logging.source [1.2.0.v20180409-1502,1.2.0.v20180409-1502]
+	org.apache.httpcomponents.httpclient [4.5.13.v20210128-2225,4.5.13.v20210128-2225]
+	org.apache.httpcomponents.httpclient.source [4.5.13.v20210128-2225,4.5.13.v20210128-2225]
+	org.apache.httpcomponents.httpcore [4.4.14.v20210128-2225,4.4.14.v20210128-2225]
+	org.apache.httpcomponents.httpcore.source [4.4.14.v20210128-2225,4.4.14.v20210128-2225]
+	org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815]
+	org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815]
+	org.apache.sshd.osgi [2.7.0.v20210623-0618,2.7.0.v20210623-0618]
+	org.apache.sshd.osgi.source [2.7.0.v20210623-0618,2.7.0.v20210623-0618]
+	org.apache.sshd.sftp [2.7.0.v20210623-0618,2.7.0.v20210623-0618]
+	org.apache.sshd.sftp.source [2.7.0.v20210623-0618,2.7.0.v20210623-0618]
+	org.assertj [3.20.2.v20210706-1104,3.20.2.v20210706-1104]
+	org.assertj.source [3.20.2.v20210706-1104,3.20.2.v20210706-1104]
+	org.bouncycastle.bcpg [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
+	org.bouncycastle.bcpg.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
+	org.bouncycastle.bcpkix [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
+	org.bouncycastle.bcpkix.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
+	org.bouncycastle.bcprov [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
+	org.bouncycastle.bcprov.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
+	org.bouncycastle.bcutil [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
+	org.bouncycastle.bcutil.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
+	org.hamcrest [2.2.0.v20210711-0821,2.2.0.v20210711-0821]
+	org.hamcrest.source [2.2.0.v20210711-0821,2.2.0.v20210711-0821]
+	org.hamcrest.core [1.3.0.v20180420-1519,1.3.0.v20180420-1519]
+	org.hamcrest.core.source [1.3.0.v20180420-1519,1.3.0.v20180420-1519]
+	org.hamcrest.library [1.3.0.v20180524-2246,1.3.0.v20180524-2246]
+	org.hamcrest.library.source [1.3.0.v20180524-2246,1.3.0.v20180524-2246]
+	org.junit [4.13.0.v20200204-1500,4.13.0.v20200204-1500]
+	org.junit.source [4.13.0.v20200204-1500,4.13.0.v20200204-1500]
+	org.kohsuke.args4j [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
+	org.kohsuke.args4j.source [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
+	org.mockito [2.23.0.v20200310-1642,2.23.0.v20200310-1642]
+	org.mockito.source [2.23.0.v20200310-1642,2.23.0.v20200310-1642]
+	org.objenesis [2.6.0.v20180420-1519,2.6.0.v20180420-1519]
+	org.objenesis.source [2.6.0.v20180420-1519,2.6.0.v20180420-1519]
+	org.slf4j.api [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
+	org.slf4j.api.source [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
+	org.slf4j.binding.log4j12 [1.7.30.v20201108-2042,1.7.30.v20201108-2042]
+	org.slf4j.binding.log4j12.source [1.7.30.v20201108-2042,1.7.30.v20201108-2042]
+	org.tukaani.xz [1.9.0.v20210624-1259,1.9.0.v20210624-1259]
+	org.tukaani.xz.source [1.9.0.v20210624-1259,1.9.0.v20210624-1259]
+}
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
index 5847b79..b1511c1 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.target</artifactId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.x.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.x.tpd
index fb0df1e..bcfd221 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.x.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.x.tpd
@@ -1,22 +1,22 @@
 target "jetty-9.4.x" with source configurePhase
 
-location jetty-9.4.40 "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/" {
-	org.eclipse.jetty.client [9.4.41.v20210516,9.4.41.v20210516]
-	org.eclipse.jetty.client.source [9.4.41.v20210516,9.4.41.v20210516]
-	org.eclipse.jetty.continuation [9.4.41.v20210516,9.4.41.v20210516]
-	org.eclipse.jetty.continuation.source [9.4.41.v20210516,9.4.41.v20210516]
-	org.eclipse.jetty.http [9.4.41.v20210516,9.4.41.v20210516]
-	org.eclipse.jetty.http.source [9.4.41.v20210516,9.4.41.v20210516]
-	org.eclipse.jetty.io [9.4.41.v20210516,9.4.41.v20210516]
-	org.eclipse.jetty.io.source [9.4.41.v20210516,9.4.41.v20210516]
-	org.eclipse.jetty.security [9.4.41.v20210516,9.4.41.v20210516]
-	org.eclipse.jetty.security.source [9.4.41.v20210516,9.4.41.v20210516]
-	org.eclipse.jetty.server [9.4.41.v20210516,9.4.41.v20210516]
-	org.eclipse.jetty.server.source [9.4.41.v20210516,9.4.41.v20210516]
-	org.eclipse.jetty.servlet [9.4.41.v20210516,9.4.41.v20210516]
-	org.eclipse.jetty.servlet.source [9.4.41.v20210516,9.4.41.v20210516]
-	org.eclipse.jetty.util [9.4.41.v20210516,9.4.41.v20210516]
-	org.eclipse.jetty.util.source [9.4.41.v20210516,9.4.41.v20210516]
-	org.eclipse.jetty.util.ajax [9.4.41.v20210516,9.4.41.v20210516]
-	org.eclipse.jetty.util.ajax.source [9.4.41.v20210516,9.4.41.v20210516]
+location jetty-9.4.x "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/" {
+	org.eclipse.jetty.client [9.4.43.v20210629,9.4.43.v20210629]
+	org.eclipse.jetty.client.source [9.4.43.v20210629,9.4.43.v20210629]
+	org.eclipse.jetty.continuation [9.4.43.v20210629,9.4.43.v20210629]
+	org.eclipse.jetty.continuation.source [9.4.43.v20210629,9.4.43.v20210629]
+	org.eclipse.jetty.http [9.4.43.v20210629,9.4.43.v20210629]
+	org.eclipse.jetty.http.source [9.4.43.v20210629,9.4.43.v20210629]
+	org.eclipse.jetty.io [9.4.43.v20210629,9.4.43.v20210629]
+	org.eclipse.jetty.io.source [9.4.43.v20210629,9.4.43.v20210629]
+	org.eclipse.jetty.security [9.4.43.v20210629,9.4.43.v20210629]
+	org.eclipse.jetty.security.source [9.4.43.v20210629,9.4.43.v20210629]
+	org.eclipse.jetty.server [9.4.43.v20210629,9.4.43.v20210629]
+	org.eclipse.jetty.server.source [9.4.43.v20210629,9.4.43.v20210629]
+	org.eclipse.jetty.servlet [9.4.43.v20210629,9.4.43.v20210629]
+	org.eclipse.jetty.servlet.source [9.4.43.v20210629,9.4.43.v20210629]
+	org.eclipse.jetty.util [9.4.43.v20210629,9.4.43.v20210629]
+	org.eclipse.jetty.util.source [9.4.43.v20210629,9.4.43.v20210629]
+	org.eclipse.jetty.util.ajax [9.4.43.v20210629,9.4.43.v20210629]
+	org.eclipse.jetty.util.ajax.source [9.4.43.v20210629,9.4.43.v20210629]
 }
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml
index 7ff001e..044d073 100644
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -16,7 +16,7 @@
 
   <groupId>org.eclipse.jgit</groupId>
   <artifactId>jgit.tycho.parent</artifactId>
-  <version>5.12.1-SNAPSHOT</version>
+  <version>5.13.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>JGit Tycho Parent</name>
diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
index 704ad7c..31629b2 100644
--- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
@@ -3,29 +3,29 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.pgm.test
 Bundle-SymbolicName: org.eclipse.jgit.pgm.test
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.jgit.api;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.diff;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.dircache;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.file;version="5.12.1",
- org.eclipse.jgit.junit;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lib;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.merge;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.pgm;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.pgm.internal;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.pgm.opt;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.storage.file;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.treewalk;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util.io;version="[5.12.1,5.13.0)",
- org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
+Import-Package: org.eclipse.jgit.api;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.api.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.diff;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.dircache;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.file;version="5.13.0",
+ org.eclipse.jgit.junit;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.merge;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.pgm;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.pgm.internal;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.pgm.opt;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.storage.file;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util.io;version="[5.13.0,5.14.0)",
+ org.hamcrest.core;bundle-version="[2.2.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.rules;version="[4.13,5.0.0)",
  org.kohsuke.args4j;version="[2.33.0,3.0.0)"
diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml
index 77dd85f..3e6eaad 100644
--- a/org.eclipse.jgit.pgm.test/pom.xml
+++ b/org.eclipse.jgit.pgm.test/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.pgm.test</artifactId>
diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index b4a1858..4a3fcc5 100644
--- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.pgm
 Bundle-SymbolicName: org.eclipse.jgit.pgm
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -14,46 +14,46 @@
  org.eclipse.jetty.servlet;version="[9.4.5,10.0.0)",
  org.eclipse.jetty.util;version="[9.4.5,10.0.0)",
  org.eclipse.jetty.util.component;version="[9.4.5,10.0.0)",
- org.eclipse.jgit.api;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.archive;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.awtui;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.blame;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.diff;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.dircache;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.gitrepo;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.io;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.pack;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lfs;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lfs.server;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lfs.server.fs;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lfs.server.s3;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lib;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.merge;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.nls;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.notes;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.revplot;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.revwalk.filter;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.storage.file;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.storage.pack;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport.http.apache;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport.resolver;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport.sshd;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.treewalk;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util.io;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.api;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.api.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.archive;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.awtui;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.blame;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.diff;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.dircache;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.gitrepo;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.io;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lfs;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lfs.server;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lfs.server.fs;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lfs.server.s3;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.merge;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.notes;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.revplot;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.revwalk.filter;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.storage.file;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.storage.pack;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport.http.apache;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport.sshd;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util.io;version="[5.13.0,5.14.0)",
  org.kohsuke.args4j;version="[2.33.0,3.0.0)",
  org.kohsuke.args4j.spi;version="[2.33.0,3.0.0)"
-Export-Package: org.eclipse.jgit.console;version="5.12.1";
+Export-Package: org.eclipse.jgit.console;version="5.13.0";
  uses:="org.eclipse.jgit.transport,
   org.eclipse.jgit.util",
- org.eclipse.jgit.pgm;version="5.12.1";
+ org.eclipse.jgit.pgm;version="5.13.0";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.util.io,
    org.eclipse.jgit.awtui,
@@ -65,14 +65,14 @@
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.api,
    javax.swing",
- org.eclipse.jgit.pgm.debug;version="5.12.1";
+ org.eclipse.jgit.pgm.debug;version="5.13.0";
   uses:="org.eclipse.jgit.util.io,
    org.eclipse.jgit.pgm,
    org.eclipse.jetty.servlet",
- org.eclipse.jgit.pgm.internal;version="5.12.1";
+ org.eclipse.jgit.pgm.internal;version="5.13.0";
   x-friends:="org.eclipse.jgit.pgm.test,
    org.eclipse.jgit.test",
- org.eclipse.jgit.pgm.opt;version="5.12.1";
+ org.eclipse.jgit.pgm.opt;version="5.13.0";
   uses:="org.kohsuke.args4j,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
index 8f433d5..90a9659 100644
--- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.pgm - Sources
 Bundle-SymbolicName: org.eclipse.jgit.pgm.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.12.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.12.1.qualifier";roots="."
+Bundle-Version: 5.13.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.13.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml
index 36da4aa..d0c6995 100644
--- a/org.eclipse.jgit.pgm/pom.xml
+++ b/org.eclipse.jgit.pgm/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.pgm</artifactId>
diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties
index 38deab9..9745003 100644
--- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties
+++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties
@@ -8,7 +8,7 @@
 # default meta variable defined in the org.kohsuke.args4j.spi.ExplicitBooleanOptionHandler
 VALUE=VAL
 # default meta variable defined in the org.kohsuke.args4j.spi.StopOptionHandler
-ARGUMENTS=ARGUMENTS
+ARGS=ARGS
 # default meta variable defined in the org.kohsuke.args4j.spi.OneArgumentOptionHandler
 N=N
 
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/TextBuiltin.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/TextBuiltin.java
index f70e72d..600200d 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/TextBuiltin.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/TextBuiltin.java
@@ -219,8 +219,12 @@ public final void execute(String[] args) throws Exception {
 		case APACHE: {
 			SshdSessionFactory factory = new SshdSessionFactory(
 					new JGitKeyCache(), new DefaultProxyDataFactory());
-			Runtime.getRuntime()
-					.addShutdownHook(new Thread(factory::close));
+			try {
+				Runtime.getRuntime()
+						.addShutdownHook(new Thread(factory::close));
+			} catch (IllegalStateException e) {
+				// ignore - the VM is already shutting down
+			}
 			SshSessionFactory.setInstance(factory);
 			break;
 		}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/PathTreeFilterHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/PathTreeFilterHandler.java
index 96c72d9..6535119 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/PathTreeFilterHandler.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/PathTreeFilterHandler.java
@@ -25,7 +25,7 @@
 import org.kohsuke.args4j.spi.Setter;
 
 /**
- * Create a {@link org.eclipse.jgit.treewalk.filter.TreeFilter} to patch math
+ * Create a {@link org.eclipse.jgit.treewalk.filter.TreeFilter} to match path
  * names.
  * <p>
  * This handler consumes all arguments to the end of the command line, and is
diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
index 2a905a1..215115e 100644
--- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
@@ -3,33 +3,34 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test
 Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.apache.sshd.client.config.hosts;version="[2.6.0,2.7.0)",
- org.apache.sshd.common;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.auth;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.config.keys;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.helpers;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.keyprovider;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.session;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.signature;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.util.net;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.util.security;version="[2.6.0,2.7.0)",
- org.apache.sshd.core;version="[2.6.0,2.7.0)",
- org.apache.sshd.server;version="[2.6.0,2.7.0)",
- org.apache.sshd.server.forward;version="[2.6.0,2.7.0)",
- org.eclipse.jgit.api;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.junit;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.junit.ssh;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lib;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport.sshd;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util;version="[5.12.1,5.13.0)",
+Import-Package: org.apache.sshd.client.config.hosts;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.auth;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.config.keys;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.helpers;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.kex;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.keyprovider;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.session;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.signature;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.net;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.security;version="[2.7.0,2.8.0)",
+ org.apache.sshd.core;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server.forward;version="[2.7.0,2.8.0)",
+ org.eclipse.jgit.api;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.api.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.junit;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.junit.ssh;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport.sshd;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+ org.hamcrest;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.experimental.theories;version="[4.13,5.0.0)",
  org.junit.runner;version="[4.13,5.0.0)"
-Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)"
diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml
index 5af16c7..1fe70fe 100644
--- a/org.eclipse.jgit.ssh.apache.test/pom.xml
+++ b/org.eclipse.jgit.ssh.apache.test/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ssh.apache.test</artifactId>
diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshTest.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshTest.java
index c56d230..c1f5fef 100644
--- a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshTest.java
+++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshTest.java
@@ -34,13 +34,18 @@
 
 import org.apache.sshd.client.config.hosts.KnownHostEntry;
 import org.apache.sshd.client.config.hosts.KnownHostHashValue;
+import org.apache.sshd.common.NamedFactory;
 import org.apache.sshd.common.config.keys.AuthorizedKeyEntry;
 import org.apache.sshd.common.config.keys.KeyUtils;
 import org.apache.sshd.common.config.keys.PublicKeyEntry;
 import org.apache.sshd.common.config.keys.PublicKeyEntryResolver;
+import org.apache.sshd.common.kex.BuiltinDHFactories;
+import org.apache.sshd.common.kex.DHFactory;
+import org.apache.sshd.common.kex.KeyExchangeFactory;
 import org.apache.sshd.common.session.Session;
 import org.apache.sshd.common.util.net.SshdSocketAddress;
 import org.apache.sshd.server.ServerAuthenticationManager;
+import org.apache.sshd.server.ServerBuilder;
 import org.apache.sshd.server.SshServer;
 import org.apache.sshd.server.forward.StaticDecisionForwardingFilter;
 import org.eclipse.jgit.api.Git;
@@ -702,4 +707,42 @@ public void testConnectAuthSshRsa() throws Exception {
 			session.disconnect();
 		}
 	}
+
+	/**
+	 * Tests that one can log in at an even poorer server that also only has the
+	 * SHA1 KEX methods available. Apparently this is the case for at least some
+	 * Microsoft TFS instances. The user has to enable the poor KEX methods in
+	 * the ssh config explicitly; we don't enable them by default.
+	 *
+	 * @throws Exception
+	 *             on failure
+	 */
+	@Test
+	public void testConnectOnlyRsaSha1() throws Exception {
+		try (SshServer oldServer = createServer(TEST_USER, publicKey1)) {
+			oldServer.setSignatureFactoriesNames("ssh-rsa");
+			List<DHFactory> sha1Factories = BuiltinDHFactories
+					.parseDHFactoriesList(
+							"diffie-hellman-group1-sha1,diffie-hellman-group14-sha1")
+					.getParsedFactories();
+			assertEquals(2, sha1Factories.size());
+			List<KeyExchangeFactory> kexFactories = NamedFactory
+					.setUpTransformedFactories(true, sha1Factories,
+							ServerBuilder.DH2KEX);
+			oldServer.setKeyExchangeFactories(kexFactories);
+			oldServer.start();
+			registerServer(oldServer);
+			installConfig("Host server", //
+					"HostName localhost", //
+					"Port " + oldServer.getPort(), //
+					"User " + TEST_USER, //
+					"IdentityFile " + privateKey1.getAbsolutePath(), //
+					"KexAlgorithms +diffie-hellman-group1-sha1");
+			RemoteSession session = getSessionFactory().getSession(
+					new URIish("ssh://server/doesntmatter"), null, FS.DETECTED,
+					10000);
+			assertNotNull(session);
+			session.disconnect();
+		}
+	}
 }
diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
index 0645964..81f7e21 100644
--- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
@@ -6,9 +6,9 @@
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.12.1";x-internal:=true;
+Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.13.0";x-internal:=true;
   uses:="org.apache.sshd.client,
    org.apache.sshd.client.auth,
    org.apache.sshd.client.auth.keyboard,
@@ -23,9 +23,9 @@
    org.apache.sshd.common.signature,
    org.apache.sshd.common.util.buffer,
    org.eclipse.jgit.transport",
- org.eclipse.jgit.internal.transport.sshd.auth;version="5.12.1";x-internal:=true,
- org.eclipse.jgit.internal.transport.sshd.proxy;version="5.12.1";x-friends:="org.eclipse.jgit.ssh.apache.test",
- org.eclipse.jgit.transport.sshd;version="5.12.1";
+ org.eclipse.jgit.internal.transport.sshd.auth;version="5.13.0";x-internal:=true,
+ org.eclipse.jgit.internal.transport.sshd.proxy;version="5.13.0";x-friends:="org.eclipse.jgit.ssh.apache.test",
+ org.eclipse.jgit.transport.sshd;version="5.13.0";
   uses:="org.eclipse.jgit.transport,
    org.apache.sshd.client.config.hosts,
    org.apache.sshd.common.keyprovider,
@@ -33,59 +33,59 @@
    org.apache.sshd.client.session,
    org.apache.sshd.client.keyverifier"
 Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)",
- org.apache.sshd.agent;version="[2.6.0,2.7.0)",
- org.apache.sshd.client;version="[2.6.0,2.7.0)",
- org.apache.sshd.client.auth;version="[2.6.0,2.7.0)",
- org.apache.sshd.client.auth.keyboard;version="[2.6.0,2.7.0)",
- org.apache.sshd.client.auth.password;version="[2.6.0,2.7.0)",
- org.apache.sshd.client.auth.pubkey;version="[2.6.0,2.7.0)",
- org.apache.sshd.client.channel;version="[2.6.0,2.7.0)",
- org.apache.sshd.client.config.hosts;version="[2.6.0,2.7.0)",
- org.apache.sshd.client.config.keys;version="[2.6.0,2.7.0)",
- org.apache.sshd.client.future;version="[2.6.0,2.7.0)",
- org.apache.sshd.client.keyverifier;version="[2.6.0,2.7.0)",
- org.apache.sshd.client.session;version="[2.6.0,2.7.0)",
- org.apache.sshd.client.session.forward;version="[2.6.0,2.7.0)",
- org.apache.sshd.common;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.auth;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.channel;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.compression;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.config.keys;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.config.keys.loader;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.digest;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.forward;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.future;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.helpers;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.io;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.kex;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.kex.extension;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.kex.extension.parser;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.keyprovider;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.mac;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.random;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.session;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.session.helpers;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.signature;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.util;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.util.buffer;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.util.closeable;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.util.io;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.util.io.resource;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.util.logging;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.util.net;version="[2.6.0,2.7.0)",
- org.apache.sshd.common.util.security;version="[2.6.0,2.7.0)",
- org.apache.sshd.core;version="[2.6.0,2.7.0)",
- org.apache.sshd.server.auth;version="[2.6.0,2.7.0)",
- org.apache.sshd.sftp;version="[2.6.0,2.7.0)",
- org.apache.sshd.sftp.client;version="[2.6.0,2.7.0)",
- org.apache.sshd.sftp.common;version="[2.6.0,2.7.0)",
- org.eclipse.jgit.annotations;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.fnmatch;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.transport.ssh;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.nls;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util;version="[5.12.1,5.13.0)",
+ org.apache.sshd.agent;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.auth;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.auth.keyboard;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.auth.password;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.auth.pubkey;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.channel;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.config.hosts;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.config.keys;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.future;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.keyverifier;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.session;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.session.forward;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.auth;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.channel;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.compression;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.config.keys;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.config.keys.loader;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.digest;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.forward;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.future;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.helpers;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.io;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.kex;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.kex.extension;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.kex.extension.parser;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.keyprovider;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.mac;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.random;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.session;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.session.helpers;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.signature;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.buffer;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.closeable;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.io;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.io.resource;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.logging;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.net;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.security;version="[2.7.0,2.8.0)",
+ org.apache.sshd.core;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server.auth;version="[2.7.0,2.8.0)",
+ org.apache.sshd.sftp;version="[2.7.0,2.8.0)",
+ org.apache.sshd.sftp.client;version="[2.7.0,2.8.0)",
+ org.apache.sshd.sftp.common;version="[2.7.0,2.8.0)",
+ org.eclipse.jgit.annotations;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.fnmatch;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.transport.ssh;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
  org.slf4j;version="[1.7.0,2.0.0)"
diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF
index 80a27d4..ded7d99 100644
--- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources
 Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.12.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.12.1.qualifier";roots="."
+Bundle-Version: 5.13.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.13.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml
index f754a3a..d37cd48 100644
--- a/org.eclipse.jgit.ssh.apache/pom.xml
+++ b/org.eclipse.jgit.ssh.apache/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ssh.apache</artifactId>
diff --git a/org.eclipse.jgit.ssh.apache/resources/org/eclipse/jgit/internal/transport/sshd/SshdText.properties b/org.eclipse.jgit.ssh.apache/resources/org/eclipse/jgit/internal/transport/sshd/SshdText.properties
index 5bc0867..defcbdc 100644
--- a/org.eclipse.jgit.ssh.apache/resources/org/eclipse/jgit/internal/transport/sshd/SshdText.properties
+++ b/org.eclipse.jgit.ssh.apache/resources/org/eclipse/jgit/internal/transport/sshd/SshdText.properties
@@ -8,6 +8,7 @@
 configNoKnownAlgorithms=Ssh config ''{0}'' ''{1}'' resulted in empty list (none known, or all known removed); using default.
 configProxyJumpNotSsh=Non-ssh URI in ProxyJump ssh config
 configProxyJumpWithPath=ProxyJump ssh config: jump host specification must not have a path
+configUnknownAlgorithm=Ssh config {0}: ignoring unknown algorithm ''{1}'' in {2} {3}
 ftpCloseFailed=Closing the SFTP channel failed
 gssapiFailure=GSS-API error for mechanism OID {0}
 gssapiInitFailure=GSS-API initialization failure for mechanism {0}
diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java
index 8183a92..f7b37d7 100644
--- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java
+++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018, 2019 Thomas Wolf <thomas.wolf@paranor.ch> and others
+ * Copyright (C) 2018, 2021 Thomas Wolf <thomas.wolf@paranor.ch> and others
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0 which is available at
@@ -16,7 +16,6 @@
 import java.io.StreamCorruptedException;
 import java.net.SocketAddress;
 import java.nio.charset.StandardCharsets;
-import java.security.GeneralSecurityException;
 import java.security.PublicKey;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -29,16 +28,27 @@
 import java.util.Objects;
 import java.util.Set;
 
+import org.apache.sshd.client.ClientBuilder;
 import org.apache.sshd.client.ClientFactoryManager;
 import org.apache.sshd.client.config.hosts.HostConfigEntry;
 import org.apache.sshd.client.keyverifier.ServerKeyVerifier;
 import org.apache.sshd.client.session.ClientSessionImpl;
 import org.apache.sshd.common.AttributeRepository;
 import org.apache.sshd.common.FactoryManager;
+import org.apache.sshd.common.NamedResource;
 import org.apache.sshd.common.PropertyResolver;
 import org.apache.sshd.common.config.keys.KeyUtils;
 import org.apache.sshd.common.io.IoSession;
 import org.apache.sshd.common.io.IoWriteFuture;
+import org.apache.sshd.common.kex.BuiltinDHFactories;
+import org.apache.sshd.common.kex.DHFactory;
+import org.apache.sshd.common.kex.KexProposalOption;
+import org.apache.sshd.common.kex.KeyExchangeFactory;
+import org.apache.sshd.common.kex.extension.KexExtensionHandler;
+import org.apache.sshd.common.kex.extension.KexExtensionHandler.AvailabilityPhase;
+import org.apache.sshd.common.kex.extension.KexExtensions;
+import org.apache.sshd.common.keyprovider.KeyPairProvider;
+import org.apache.sshd.common.signature.BuiltinSignatures;
 import org.apache.sshd.common.util.Readable;
 import org.apache.sshd.common.util.buffer.Buffer;
 import org.eclipse.jgit.errors.InvalidPatternException;
@@ -69,6 +79,8 @@ public class JGitClientSession extends ClientSessionImpl {
 	 */
 	private static final int DEFAULT_MAX_IDENTIFICATION_SIZE = 64 * 1024;
 
+	private static final AttributeKey<Boolean> INITIAL_KEX_DONE = new AttributeKey<>();
+
 	private HostConfigEntry hostConfig;
 
 	private CredentialsProvider credentialsProvider;
@@ -135,51 +147,38 @@ public void setProxyHandler(StatefulProxyConnector handler) {
 	}
 
 	@Override
-	protected IoWriteFuture sendIdentification(String ident)
-			throws IOException {
+	protected IoWriteFuture sendIdentification(String ident,
+			List<String> extraLines) throws Exception {
 		StatefulProxyConnector proxy = proxyHandler;
 		if (proxy != null) {
-			try {
-				// We must not block here; the framework starts reading messages
-				// from the peer only once the initial sendKexInit() following
-				// this call to sendIdentification() has returned!
-				proxy.runWhenDone(() -> {
-					JGitClientSession.super.sendIdentification(ident);
-					return null;
-				});
-				// Called only from the ClientSessionImpl constructor, where the
-				// return value is ignored.
+			// We must not block here; the framework starts reading messages
+			// from the peer only once the initial sendKexInit() following
+			// this call to sendIdentification() has returned!
+			proxy.runWhenDone(() -> {
+				JGitClientSession.super.sendIdentification(ident, extraLines);
 				return null;
-			} catch (IOException e) {
-				throw e;
-			} catch (Exception other) {
-				throw new IOException(other.getLocalizedMessage(), other);
-			}
+			});
+			// Called only from the ClientSessionImpl constructor, where the
+			// return value is ignored.
+			return null;
 		}
-		return super.sendIdentification(ident);
+		return super.sendIdentification(ident, extraLines);
 	}
 
 	@Override
-	protected byte[] sendKexInit()
-			throws IOException, GeneralSecurityException {
+	protected byte[] sendKexInit() throws Exception {
 		StatefulProxyConnector proxy = proxyHandler;
 		if (proxy != null) {
-			try {
-				// We must not block here; the framework starts reading messages
-				// from the peer only once the initial sendKexInit() has
-				// returned!
-				proxy.runWhenDone(() -> {
-					JGitClientSession.super.sendKexInit();
-					return null;
-				});
-				// This is called only from the ClientSessionImpl
-				// constructor, where the return value is ignored.
+			// We must not block here; the framework starts reading messages
+			// from the peer only once the initial sendKexInit() has
+			// returned!
+			proxy.runWhenDone(() -> {
+				JGitClientSession.super.sendKexInit();
 				return null;
-			} catch (IOException | GeneralSecurityException e) {
-				throw e;
-			} catch (Exception other) {
-				throw new IOException(other.getLocalizedMessage(), other);
-			}
+			});
+			// This is called only from the ClientSessionImpl
+			// constructor, where the return value is ignored.
+			return null;
 		}
 		return super.sendKexInit();
 	}
@@ -201,6 +200,50 @@ public void messageReceived(Readable buffer) throws Exception {
 	}
 
 	@Override
+	protected Map<KexProposalOption, String> setNegotiationResult(
+			Map<KexProposalOption, String> guess) {
+		Map<KexProposalOption, String> result = super.setNegotiationResult(
+				guess);
+		// This should be doable with a SessionListener, too, but I don't see
+		// how to add a listener in time to catch the negotiation end for sure
+		// given that the super-constructor already starts KEX.
+		//
+		// TODO: This override can be removed once we use sshd 2.8.0.
+		if (log.isDebugEnabled()) {
+			result.forEach((option, value) -> log.debug(
+					"setNegotiationResult({}) Kex: {} = {}", this, //$NON-NLS-1$
+					option.getDescription(), value));
+		}
+		return result;
+	}
+
+	Set<String> getAllAvailableSignatureAlgorithms() {
+		Set<String> allAvailable = new HashSet<>();
+		BuiltinSignatures.VALUES.forEach(s -> allAvailable.add(s.getName()));
+		BuiltinSignatures.getRegisteredExtensions()
+				.forEach(s -> allAvailable.add(s.getName()));
+		return allAvailable;
+	}
+
+	private void setNewFactories(Collection<String> defaultFactories,
+			Collection<String> finalFactories) {
+		// If new factory names were added make sure we actually have factories
+		// for them all.
+		//
+		// But add new ones at the end: we don't want to change the order for
+		// pubkey auth, and any new ones added here were not included in the
+		// default set for some reason, such as being deprecated or weak.
+		//
+		// The order for KEX is determined by the order in the proposal string,
+		// but the order in pubkey auth is determined by the order in the
+		// factory list (possibly overridden via ssh config
+		// PubkeyAcceptedAlgorithms; see JGitPublicKeyAuthentication).
+		Set<String> resultSet = new LinkedHashSet<>(defaultFactories);
+		resultSet.addAll(finalFactories);
+		setSignatureFactoriesNames(resultSet);
+	}
+
+	@Override
 	protected String resolveAvailableSignaturesProposal(
 			FactoryManager manager) {
 		List<String> defaultSignatures = getSignatureFactoriesNames();
@@ -210,16 +253,17 @@ protected String resolveAvailableSignaturesProposal(
 				.getProperty(SshConstants.HOST_KEY_ALGORITHMS);
 		if (!StringUtils.isEmptyOrNull(algorithms)) {
 			List<String> result = modifyAlgorithmList(defaultSignatures,
-					algorithms, SshConstants.HOST_KEY_ALGORITHMS);
+					getAllAvailableSignatureAlgorithms(), algorithms,
+					SshConstants.HOST_KEY_ALGORITHMS);
 			if (!result.isEmpty()) {
 				if (log.isDebugEnabled()) {
 					log.debug(SshConstants.HOST_KEY_ALGORITHMS + ' ' + result);
 				}
+				setNewFactories(defaultSignatures, result);
 				return String.join(",", result); //$NON-NLS-1$
 			}
 			log.warn(format(SshdText.get().configNoKnownAlgorithms,
-					SshConstants.HOST_KEY_ALGORITHMS,
-					algorithms));
+					SshConstants.HOST_KEY_ALGORITHMS, algorithms));
 		}
 		// No HostKeyAlgorithms; using default -- change order to put existing
 		// keys first.
@@ -234,6 +278,11 @@ protected String resolveAvailableSignaturesProposal(
 				if (key != null) {
 					String keyType = KeyUtils.getKeyType(key);
 					if (keyType != null) {
+						if (KeyPairProvider.SSH_RSA.equals(keyType)) {
+							// Add all available signatures for ssh-rsa.
+							reordered.add(KeyUtils.RSA_SHA512_KEY_TYPE_ALIAS);
+							reordered.add(KeyUtils.RSA_SHA256_KEY_TYPE_ALIAS);
+						}
 						reordered.add(keyType);
 					}
 				}
@@ -242,6 +291,10 @@ protected String resolveAvailableSignaturesProposal(
 			if (log.isDebugEnabled()) {
 				log.debug(SshConstants.HOST_KEY_ALGORITHMS + ' ' + reordered);
 			}
+			// Make sure we actually have factories for them all.
+			if (reordered.size() > defaultSignatures.size()) {
+				setNewFactories(defaultSignatures, reordered);
+			}
 			return String.join(",", reordered); //$NON-NLS-1$
 		}
 		if (log.isDebugEnabled()) {
@@ -251,15 +304,87 @@ protected String resolveAvailableSignaturesProposal(
 		return String.join(",", defaultSignatures); //$NON-NLS-1$
 	}
 
+	private List<String> determineKexProposal() {
+		List<KeyExchangeFactory> kexFactories = getKeyExchangeFactories();
+		List<String> defaultKexMethods = NamedResource
+				.getNameList(kexFactories);
+		HostConfigEntry config = resolveAttribute(
+				JGitSshClient.HOST_CONFIG_ENTRY);
+		String algorithms = config.getProperty(SshConstants.KEX_ALGORITHMS);
+		if (!StringUtils.isEmptyOrNull(algorithms)) {
+			Set<String> allAvailable = new HashSet<>();
+			BuiltinDHFactories.VALUES
+					.forEach(s -> allAvailable.add(s.getName()));
+			BuiltinDHFactories.getRegisteredExtensions()
+					.forEach(s -> allAvailable.add(s.getName()));
+			List<String> result = modifyAlgorithmList(defaultKexMethods,
+					allAvailable, algorithms, SshConstants.KEX_ALGORITHMS);
+			if (!result.isEmpty()) {
+				// If new ones were added, update the installed factories
+				Set<String> configuredKexMethods = new HashSet<>(
+						defaultKexMethods);
+				List<KeyExchangeFactory> newKexFactories = new ArrayList<>();
+				result.forEach(name -> {
+					if (!configuredKexMethods.contains(name)) {
+						DHFactory factory = BuiltinDHFactories
+								.resolveFactory(name);
+						if (factory == null) {
+							// Should not occur here
+							if (log.isDebugEnabled()) {
+								log.debug(
+										"determineKexProposal({}) unknown KEX algorithm {} ignored", //$NON-NLS-1$
+										this, name);
+							}
+						} else {
+							newKexFactories
+									.add(ClientBuilder.DH2KEX.apply(factory));
+						}
+					}
+				});
+				if (!newKexFactories.isEmpty()) {
+					newKexFactories.addAll(kexFactories);
+					setKeyExchangeFactories(newKexFactories);
+				}
+				return result;
+			}
+			log.warn(format(SshdText.get().configNoKnownAlgorithms,
+					SshConstants.KEX_ALGORITHMS, algorithms));
+		}
+		return defaultKexMethods;
+	}
+
+	@Override
+	protected String resolveSessionKexProposal(String hostKeyTypes)
+			throws IOException {
+		String kexMethods = String.join(",", determineKexProposal()); //$NON-NLS-1$
+		Boolean isRekey = getAttribute(INITIAL_KEX_DONE);
+		if (isRekey == null || !isRekey.booleanValue()) {
+			// First time
+			KexExtensionHandler extHandler = getKexExtensionHandler();
+			if (extHandler != null && extHandler.isKexExtensionsAvailable(this,
+					AvailabilityPhase.PROPOSAL)) {
+				if (kexMethods.isEmpty()) {
+					kexMethods = KexExtensions.CLIENT_KEX_EXTENSION;
+				} else {
+					kexMethods += ',' + KexExtensions.CLIENT_KEX_EXTENSION;
+				}
+			}
+			setAttribute(INITIAL_KEX_DONE, Boolean.TRUE);
+		}
+		if (log.isDebugEnabled()) {
+			log.debug(SshConstants.KEX_ALGORITHMS + ' ' + kexMethods);
+		}
+		return kexMethods;
+	}
+
 	/**
 	 * Modifies a given algorithm list according to a list from the ssh config,
-	 * including remove ('-') and reordering ('^') operators. Addition ('+') is
-	 * not handled since we have no way of adding dynamically implementations,
-	 * and the defaultList is supposed to contain all known implementations
-	 * already.
+	 * including add ('+'), remove ('-') and reordering ('^') operators.
 	 *
 	 * @param defaultList
 	 *            to modify
+	 * @param allAvailable
+	 *            all available values
 	 * @param fromConfig
 	 *            telling how to modify the {@code defaultList}, must not be
 	 *            {@code null} or empty
@@ -269,22 +394,22 @@ protected String resolveAvailableSignaturesProposal(
 	 *         set
 	 */
 	public List<String> modifyAlgorithmList(List<String> defaultList,
-			String fromConfig, String overrideKey) {
+			Set<String> allAvailable, String fromConfig, String overrideKey) {
 		Set<String> defaults = new LinkedHashSet<>();
 		defaults.addAll(defaultList);
 		switch (fromConfig.charAt(0)) {
 		case '+':
-			// Additions make not much sense -- it's either in
-			// defaultList already, or we have no implementation for
-			// it. No point in proposing it.
-			return defaultList;
+			List<String> newSignatures = filteredList(allAvailable, overrideKey,
+					fromConfig.substring(1));
+			defaults.addAll(newSignatures);
+			return new ArrayList<>(defaults);
 		case '-':
 			// This takes wildcard patterns!
 			removeFromList(defaults, overrideKey, fromConfig.substring(1));
 			return new ArrayList<>(defaults);
 		case '^':
 			// Specified entries go to the front of the default list
-			List<String> allSignatures = filteredList(defaults,
+			List<String> allSignatures = filteredList(allAvailable, overrideKey,
 					fromConfig.substring(1));
 			Set<String> atFront = new HashSet<>(allSignatures);
 			for (String sig : defaults) {
@@ -296,7 +421,7 @@ public List<String> modifyAlgorithmList(List<String> defaultList,
 		default:
 			// Default is overridden -- only accept the ones for which we do
 			// have an implementation.
-			return filteredList(defaults, fromConfig);
+			return filteredList(allAvailable, overrideKey, fromConfig);
 		}
 	}
 
@@ -323,11 +448,15 @@ private void removeFromList(Set<String> current, String key,
 		}
 	}
 
-	private List<String> filteredList(Set<String> known, String values) {
+	private List<String> filteredList(Set<String> known, String key,
+			String values) {
 		List<String> newNames = new ArrayList<>();
 		for (String newValue : values.split("\\s*,\\s*")) { //$NON-NLS-1$
 			if (known.contains(newValue)) {
 				newNames.add(newValue);
+			} else {
+				log.warn(format(SshdText.get().configUnknownAlgorithm, this,
+						newValue, key, values));
 			}
 		}
 		return newNames;
diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitKexExtensionHandler.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitKexExtensionHandler.java
deleted file mode 100644
index 9446aaa..0000000
--- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitKexExtensionHandler.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) 2021 Thomas Wolf <thomas.wolf@paranor.ch> and others
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Distribution License v. 1.0 which is available at
- * https://www.eclipse.org/org/documents/edl-v10.php.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-package org.eclipse.jgit.internal.transport.sshd;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.apache.sshd.common.AttributeRepository.AttributeKey;
-import org.apache.sshd.common.NamedFactory;
-import org.apache.sshd.common.kex.KexProposalOption;
-import org.apache.sshd.common.kex.extension.KexExtensionHandler;
-import org.apache.sshd.common.kex.extension.KexExtensions;
-import org.apache.sshd.common.kex.extension.parser.ServerSignatureAlgorithms;
-import org.apache.sshd.common.session.Session;
-import org.apache.sshd.common.signature.Signature;
-import org.apache.sshd.common.util.logging.AbstractLoggingBean;
-import org.eclipse.jgit.util.StringUtils;
-
-/**
- * Do not use the DefaultClientKexExtensionHandler from sshd; it doesn't work
- * properly because of misconceptions. See SSHD-1141.
- *
- * @see <a href="https://issues.apache.org/jira/browse/SSHD-1141">SSHD-1141</a>
- */
-public class JGitKexExtensionHandler extends AbstractLoggingBean
-		implements KexExtensionHandler {
-
-	/** Singleton instance. */
-	public static final JGitKexExtensionHandler INSTANCE = new JGitKexExtensionHandler();
-
-	/**
-	 * Session {@link AttributeKey} used to store whether the extension
-	 * indicator was already sent.
-	 */
-	private static final AttributeKey<Boolean> CLIENT_PROPOSAL_MADE = new AttributeKey<>();
-
-	/**
-	 * Session {@link AttributeKey} storing the algorithms announced by the
-	 * server as known.
-	 */
-	public static final AttributeKey<Set<String>> SERVER_ALGORITHMS = new AttributeKey<>();
-
-	private JGitKexExtensionHandler() {
-		// No public instantiation for singleton
-	}
-
-	@Override
-	public boolean isKexExtensionsAvailable(Session session,
-			AvailabilityPhase phase) throws IOException {
-		return !AvailabilityPhase.PREKEX.equals(phase);
-	}
-
-	@Override
-	public void handleKexInitProposal(Session session, boolean initiator,
-			Map<KexProposalOption, String> proposal) throws IOException {
-		// If it's the very first time, we may add the marker telling the server
-		// that we are ready to handle SSH_MSG_EXT_INFO
-		if (session == null || session.isServerSession() || !initiator) {
-			return;
-		}
-		if (session.getAttribute(CLIENT_PROPOSAL_MADE) != null) {
-			return;
-		}
-		String kexAlgorithms = proposal.get(KexProposalOption.SERVERKEYS);
-		if (StringUtils.isEmptyOrNull(kexAlgorithms)) {
-			return;
-		}
-		List<String> algorithms = new ArrayList<>();
-		// We're a client. We mustn't send the server extension, and we should
-		// send the client extension only once.
-		for (String algo : kexAlgorithms.split(",")) { //$NON-NLS-1$
-			if (KexExtensions.CLIENT_KEX_EXTENSION.equalsIgnoreCase(algo)
-					|| KexExtensions.SERVER_KEX_EXTENSION
-							.equalsIgnoreCase(algo)) {
-				continue;
-			}
-			algorithms.add(algo);
-		}
-		// Tell the server that we want to receive SSH2_MSG_EXT_INFO
-		algorithms.add(KexExtensions.CLIENT_KEX_EXTENSION);
-		if (log.isDebugEnabled()) {
-			log.debug(
-					"handleKexInitProposal({}): proposing HostKeyAlgorithms {}", //$NON-NLS-1$
-					session, algorithms);
-		}
-		proposal.put(KexProposalOption.SERVERKEYS,
-				String.join(",", algorithms)); //$NON-NLS-1$
-		session.setAttribute(CLIENT_PROPOSAL_MADE, Boolean.TRUE);
-	}
-
-	@Override
-	public boolean handleKexExtensionRequest(Session session, int index,
-			int count, String name, byte[] data) throws IOException {
-		if (ServerSignatureAlgorithms.NAME.equals(name)) {
-			handleServerSignatureAlgorithms(session,
-					ServerSignatureAlgorithms.INSTANCE.parseExtension(data));
-		}
-		return true;
-	}
-
-	/**
-	 * Perform updates after a server-sig-algs extension has been received.
-	 *
-	 * @param session
-	 *            the message was received for
-	 * @param serverAlgorithms
-	 *            signature algorithm names announced by the server
-	 */
-	protected void handleServerSignatureAlgorithms(Session session,
-			Collection<String> serverAlgorithms) {
-		if (log.isDebugEnabled()) {
-			log.debug("handleServerSignatureAlgorithms({}): {}", session, //$NON-NLS-1$
-					serverAlgorithms);
-		}
-		// Client determines order; server says what it supports. Re-order
-		// such that supported ones are at the front, in client order,
-		// followed by unsupported ones, also in client order.
-		if (serverAlgorithms != null && !serverAlgorithms.isEmpty()) {
-			List<NamedFactory<Signature>> clientAlgorithms = new ArrayList<>(
-					session.getSignatureFactories());
-			if (log.isDebugEnabled()) {
-				log.debug(
-						"handleServerSignatureAlgorithms({}): PubkeyAcceptedAlgorithms before: {}", //$NON-NLS-1$
-						session, clientAlgorithms);
-			}
-			List<NamedFactory<Signature>> unknown = new ArrayList<>();
-			Set<String> known = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
-			known.addAll(serverAlgorithms);
-			for (Iterator<NamedFactory<Signature>> iter = clientAlgorithms
-					.iterator(); iter.hasNext();) {
-				NamedFactory<Signature> algo = iter.next();
-				if (!known.contains(algo.getName())) {
-					unknown.add(algo);
-					iter.remove();
-				}
-			}
-			// Re-add the unknown ones at the end. Per RFC 8308, some
-			// servers may not announce _all_ their supported algorithms,
-			// and a client may use unknown algorithms.
-			clientAlgorithms.addAll(unknown);
-			if (log.isDebugEnabled()) {
-				log.debug(
-						"handleServerSignatureAlgorithms({}): PubkeyAcceptedAlgorithms after: {}", //$NON-NLS-1$
-						session, clientAlgorithms);
-			}
-			session.setAttribute(SERVER_ALGORITHMS, known);
-			session.setSignatureFactories(clientAlgorithms);
-		}
-	}
-}
diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitPublicKeyAuthentication.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitPublicKeyAuthentication.java
index 6755094..08da18f 100644
--- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitPublicKeyAuthentication.java
+++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitPublicKeyAuthentication.java
@@ -9,216 +9,56 @@
  */
 package org.eclipse.jgit.internal.transport.sshd;
 
-import java.io.IOException;
-import java.security.PublicKey;
-import java.security.spec.InvalidKeySpecException;
-import java.text.MessageFormat;
-import java.util.Deque;
-import java.util.HashSet;
-import java.util.LinkedList;
+import static java.text.MessageFormat.format;
+import static org.eclipse.jgit.transport.SshConstants.PUBKEY_ACCEPTED_ALGORITHMS;
+
 import java.util.List;
-import java.util.Set;
 
 import org.apache.sshd.client.auth.pubkey.UserAuthPublicKey;
+import org.apache.sshd.client.config.hosts.HostConfigEntry;
 import org.apache.sshd.client.session.ClientSession;
 import org.apache.sshd.common.NamedFactory;
-import org.apache.sshd.common.NamedResource;
-import org.apache.sshd.common.RuntimeSshException;
-import org.apache.sshd.common.SshConstants;
-import org.apache.sshd.common.config.keys.KeyUtils;
 import org.apache.sshd.common.signature.Signature;
-import org.apache.sshd.common.signature.SignatureFactoriesHolder;
-import org.apache.sshd.common.util.buffer.Buffer;
+import org.eclipse.jgit.util.StringUtils;
 
 /**
- * Custom {@link UserAuthPublicKey} implementation fixing SSHD-1105: if there
- * are several signature algorithms applicable for a public key type, we must
- * try them all, in the correct order.
- *
- * @see <a href="https://issues.apache.org/jira/browse/SSHD-1105">SSHD-1105</a>
- * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=572056">Bug
- *      572056</a>
+ * Custom {@link UserAuthPublicKey} implementation for handling SSH config
+ * PubkeyAcceptedAlgorithms.
  */
 public class JGitPublicKeyAuthentication extends UserAuthPublicKey {
 
-	private final Deque<String> currentAlgorithms = new LinkedList<>();
-
-	private String chosenAlgorithm;
-
 	JGitPublicKeyAuthentication(List<NamedFactory<Signature>> factories) {
 		super(factories);
 	}
 
 	@Override
-	protected boolean sendAuthDataRequest(ClientSession session, String service)
+	public void init(ClientSession rawSession, String service)
 			throws Exception {
-		if (current == null) {
-			currentAlgorithms.clear();
-			chosenAlgorithm = null;
+		if (!(rawSession instanceof JGitClientSession)) {
+			throw new IllegalStateException("Wrong session type: " //$NON-NLS-1$
+					+ rawSession.getClass().getCanonicalName());
 		}
-		String currentAlgorithm = null;
-		if (current != null && !currentAlgorithms.isEmpty()) {
-			currentAlgorithm = currentAlgorithms.poll();
-			if (chosenAlgorithm != null) {
-				Set<String> knownServerAlgorithms = session.getAttribute(
-						JGitKexExtensionHandler.SERVER_ALGORITHMS);
-				if (knownServerAlgorithms != null
-						&& knownServerAlgorithms.contains(chosenAlgorithm)) {
-					// We've tried key 'current' with 'chosenAlgorithm', but it
-					// failed. However, the server had told us it supported
-					// 'chosenAlgorithm'. Thus it makes no sense to continue
-					// with this key and other signature algorithms. Skip to the
-					// next key, if any.
-					currentAlgorithm = null;
-				}
-			}
-		}
-		if (currentAlgorithm == null) {
-			try {
-				if (keys == null || !keys.hasNext()) {
-					if (log.isDebugEnabled()) {
-						log.debug(
-								"sendAuthDataRequest({})[{}] no more keys to send", //$NON-NLS-1$
-								session, service);
-					}
-					current = null;
-					return false;
-				}
-				current = keys.next();
-				currentAlgorithms.clear();
-				chosenAlgorithm = null;
-			} catch (Error e) { // Copied from superclass
-				throw new RuntimeSshException(e);
-			}
-		}
-		PublicKey key;
-		try {
-			key = current.getPublicKey();
-		} catch (Error e) { // Copied from superclass
-			throw new RuntimeSshException(e);
-		}
-		if (currentAlgorithm == null) {
-			String keyType = KeyUtils.getKeyType(key);
-			Set<String> aliases = new HashSet<>(
-					KeyUtils.getAllEquivalentKeyTypes(keyType));
-			aliases.add(keyType);
-			List<NamedFactory<Signature>> existingFactories;
-			if (current instanceof SignatureFactoriesHolder) {
-				existingFactories = ((SignatureFactoriesHolder) current)
-						.getSignatureFactories();
-			} else {
-				existingFactories = getSignatureFactories();
-			}
-			if (existingFactories != null) {
+		JGitClientSession session = ((JGitClientSession) rawSession);
+		HostConfigEntry hostConfig = session.getHostConfigEntry();
+		// Set signature algorithms for public key authentication
+		String pubkeyAlgos = hostConfig.getProperty(PUBKEY_ACCEPTED_ALGORITHMS);
+		if (!StringUtils.isEmptyOrNull(pubkeyAlgos)) {
+			List<String> signatures = session.getSignatureFactoriesNames();
+			signatures = session.modifyAlgorithmList(signatures,
+					session.getAllAvailableSignatureAlgorithms(), pubkeyAlgos,
+					PUBKEY_ACCEPTED_ALGORITHMS);
+			if (!signatures.isEmpty()) {
 				if (log.isDebugEnabled()) {
-					log.debug(
-							"sendAuthDataRequest({})[{}] selecting from PubKeyAcceptedAlgorithms {}", //$NON-NLS-1$
-							session, service,
-							NamedResource.getNames(existingFactories));
+					log.debug(PUBKEY_ACCEPTED_ALGORITHMS + ' ' + signatures);
 				}
-				// Select the factories by name and in order
-				existingFactories.forEach(f -> {
-					if (aliases.contains(f.getName())) {
-						currentAlgorithms.add(f.getName());
-					}
-				});
+				setSignatureFactoriesNames(signatures);
+			} else {
+				log.warn(format(SshdText.get().configNoKnownAlgorithms,
+						PUBKEY_ACCEPTED_ALGORITHMS, pubkeyAlgos));
 			}
-			currentAlgorithm = currentAlgorithms.isEmpty() ? keyType
-					: currentAlgorithms.poll();
 		}
-		String name = getName();
-		if (log.isDebugEnabled()) {
-			log.debug(
-					"sendAuthDataRequest({})[{}] send SSH_MSG_USERAUTH_REQUEST request {} type={} - fingerprint={}", //$NON-NLS-1$
-					session, service, name, currentAlgorithm,
-					KeyUtils.getFingerPrint(key));
-		}
-
-		chosenAlgorithm = currentAlgorithm;
-		Buffer buffer = session
-				.createBuffer(SshConstants.SSH_MSG_USERAUTH_REQUEST);
-		buffer.putString(session.getUsername());
-		buffer.putString(service);
-		buffer.putString(name);
-		buffer.putBoolean(false);
-		buffer.putString(currentAlgorithm);
-		buffer.putPublicKey(key);
-		session.writePacket(buffer);
-		return true;
-	}
-
-	@Override
-	protected boolean processAuthDataRequest(ClientSession session,
-			String service, Buffer buffer) throws Exception {
-		String name = getName();
-		int cmd = buffer.getUByte();
-		if (cmd != SshConstants.SSH_MSG_USERAUTH_PK_OK) {
-			throw new IllegalStateException(MessageFormat.format(
-					SshdText.get().pubkeyAuthWrongCommand,
-					SshConstants.getCommandMessageName(cmd),
-					session.getConnectAddress(), session.getServerVersion()));
-		}
-		PublicKey key;
-		try {
-			key = current.getPublicKey();
-		} catch (Error e) { // Copied from superclass
-			throw new RuntimeSshException(e);
-		}
-		String rspKeyAlgorithm = buffer.getString();
-		PublicKey rspKey = buffer.getPublicKey();
-		if (log.isDebugEnabled()) {
-			log.debug(
-					"processAuthDataRequest({})[{}][{}] SSH_MSG_USERAUTH_PK_OK type={}, fingerprint={}", //$NON-NLS-1$
-					session, service, name, rspKeyAlgorithm,
-					KeyUtils.getFingerPrint(rspKey));
-		}
-		if (!KeyUtils.compareKeys(rspKey, key)) {
-			throw new InvalidKeySpecException(MessageFormat.format(
-					SshdText.get().pubkeyAuthWrongKey,
-					KeyUtils.getFingerPrint(key),
-					KeyUtils.getFingerPrint(rspKey),
-					session.getConnectAddress(), session.getServerVersion()));
-		}
-		if (!chosenAlgorithm.equalsIgnoreCase(rspKeyAlgorithm)) {
-			// 'algo' SHOULD be the same as 'chosenAlgorithm', which is the one
-			// we sent above. See https://tools.ietf.org/html/rfc4252#page-9 .
-			//
-			// However, at least Github (SSH-2.0-babeld-383743ad) servers seem
-			// to return the key type, not the algorithm name.
-			//
-			// So we don't check but just log the inconsistency. We sign using
-			// 'chosenAlgorithm' in any case, so we don't really care what the
-			// server says here.
-			log.warn(MessageFormat.format(
-					SshdText.get().pubkeyAuthWrongSignatureAlgorithm,
-					chosenAlgorithm, rspKeyAlgorithm, session.getConnectAddress(),
-					session.getServerVersion()));
-		}
-		String username = session.getUsername();
-		Buffer out = session
-				.createBuffer(SshConstants.SSH_MSG_USERAUTH_REQUEST);
-		out.putString(username);
-		out.putString(service);
-		out.putString(name);
-		out.putBoolean(true);
-		out.putString(chosenAlgorithm);
-		out.putPublicKey(key);
-		if (log.isDebugEnabled()) {
-			log.debug(
-					"processAuthDataRequest({})[{}][{}]: signing with algorithm {}", //$NON-NLS-1$
-					session, service, name, chosenAlgorithm);
-		}
-		appendSignature(session, service, name, username, chosenAlgorithm, key,
-				out);
-		session.writePacket(out);
-		return true;
-	}
-
-	@Override
-	protected void releaseKeys() throws IOException {
-		currentAlgorithms.clear();
-		current = null;
-		chosenAlgorithm = null;
-		super.releaseKeys();
+		// If we don't set signature factories here, the default ones from the
+		// session will be used.
+		super.init(session, service);
 	}
 }
diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitSshClient.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitSshClient.java
index 071e197..ae12c20 100644
--- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitSshClient.java
+++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitSshClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018, 2020 Thomas Wolf <thomas.wolf@paranor.ch> and others
+ * Copyright (C) 2018, 2021 Thomas Wolf <thomas.wolf@paranor.ch> and others
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0 which is available at
@@ -267,24 +267,6 @@ private JGitClientSession createSession(IoSession ioSession,
 		session.setUsername(username);
 		session.setConnectAddress(address);
 		session.setHostConfigEntry(hostConfig);
-		// Set signature algorithms for public key authentication
-		String pubkeyAlgos = hostConfig
-				.getProperty(SshConstants.PUBKEY_ACCEPTED_ALGORITHMS);
-		if (!StringUtils.isEmptyOrNull(pubkeyAlgos)) {
-			List<String> signatures = getSignatureFactoriesNames();
-			signatures = session.modifyAlgorithmList(signatures, pubkeyAlgos,
-					SshConstants.PUBKEY_ACCEPTED_ALGORITHMS);
-			if (!signatures.isEmpty()) {
-				if (log.isDebugEnabled()) {
-					log.debug(SshConstants.PUBKEY_ACCEPTED_ALGORITHMS + ' '
-							+ signatures);
-				}
-				session.setSignatureFactoriesNames(signatures);
-			} else {
-				log.warn(format(SshdText.get().configNoKnownAlgorithms,
-						SshConstants.PUBKEY_ACCEPTED_ALGORITHMS, pubkeyAlgos));
-			}
-		}
 		if (session.getCredentialsProvider() == null) {
 			session.setCredentialsProvider(getCredentialsProvider());
 		}
diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java
index 1a530b7..85e406f 100644
--- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java
+++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018, 2019 Thomas Wolf <thomas.wolf@paranor.ch> and others
+ * Copyright (C) 2018, 2021 Thomas Wolf <thomas.wolf@paranor.ch> and others
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0 which is available at
@@ -182,10 +182,13 @@ public List<PublicKey> lookup(@NonNull String connectAddress,
 		for (HostKeyFile file : filesToUse) {
 			for (HostEntryPair current : file.get()) {
 				KnownHostEntry entry = current.getHostEntry();
-				for (SshdSocketAddress host : candidates) {
-					if (entry.isHostMatch(host.getHostName(), host.getPort())) {
-						result.add(current.getServerKey());
-						break;
+				if (!isRevoked(entry)) {
+					for (SshdSocketAddress host : candidates) {
+						if (entry.isHostMatch(host.getHostName(),
+								host.getPort())) {
+							result.add(current.getServerKey());
+							break;
+						}
 					}
 				}
 			}
@@ -266,6 +269,10 @@ private static class RevokedKeyException extends Exception {
 		private static final long serialVersionUID = 1L;
 	}
 
+	private boolean isRevoked(KnownHostEntry entry) {
+		return MARKER_REVOKED.equals(entry.getMarker());
+	}
+
 	private boolean find(Collection<SshdSocketAddress> candidates,
 			PublicKey serverKey, List<HostEntryPair> entries,
 			HostEntryPair[] modified) throws RevokedKeyException {
@@ -273,22 +280,22 @@ private boolean find(Collection<SshdSocketAddress> candidates,
 			KnownHostEntry entry = current.getHostEntry();
 			for (SshdSocketAddress host : candidates) {
 				if (entry.isHostMatch(host.getHostName(), host.getPort())) {
-					boolean isRevoked = MARKER_REVOKED
-							.equals(entry.getMarker());
+					boolean revoked = isRevoked(entry);
 					if (KeyUtils.compareKeys(serverKey,
 							current.getServerKey())) {
 						// Exact match
-						if (isRevoked) {
+						if (revoked) {
 							throw new RevokedKeyException();
 						}
 						modified[0] = null;
 						return true;
-					} else if (!isRevoked) {
+					} else if (!revoked) {
 						// Server sent a different key
 						modified[0] = current;
 						// Keep going -- maybe there's another entry for this
 						// host
 					}
+					break;
 				}
 			}
 		}
diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/SshdText.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/SshdText.java
index 73c2288..c0f5719 100644
--- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/SshdText.java
+++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/SshdText.java
@@ -28,6 +28,7 @@ public static SshdText get() {
 	/***/ public String configNoKnownAlgorithms;
 	/***/ public String configProxyJumpNotSsh;
 	/***/ public String configProxyJumpWithPath;
+	/***/ public String configUnknownAlgorithm;
 	/***/ public String ftpCloseFailed;
 	/***/ public String gssapiFailure;
 	/***/ public String gssapiInitFailure;
diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/ServerKeyDatabase.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/ServerKeyDatabase.java
index b8e6cfd..b1b3c18 100644
--- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/ServerKeyDatabase.java
+++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/ServerKeyDatabase.java
@@ -30,7 +30,7 @@
 public interface ServerKeyDatabase {
 
 	/**
-	 * Retrieves all known host keys for the given addresses.
+	 * Retrieves all known and not revoked host keys for the given addresses.
 	 *
 	 * @param connectAddress
 	 *            IP address the session tried to connect to
@@ -39,7 +39,7 @@ public interface ServerKeyDatabase {
 	 * @param config
 	 *            giving access to potentially interesting configuration
 	 *            settings
-	 * @return the list of known keys for the given addresses
+	 * @return the list of known and not revoked keys for the given addresses
 	 */
 	@NonNull
 	List<PublicKey> lookup(@NonNull String connectAddress,
diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSessionFactory.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSessionFactory.java
index 2d7e0c7..cad959c 100644
--- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSessionFactory.java
+++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSessionFactory.java
@@ -47,7 +47,6 @@
 import org.eclipse.jgit.internal.transport.sshd.AuthenticationCanceledException;
 import org.eclipse.jgit.internal.transport.sshd.CachingKeyPairProvider;
 import org.eclipse.jgit.internal.transport.sshd.GssApiWithMicAuthFactory;
-import org.eclipse.jgit.internal.transport.sshd.JGitKexExtensionHandler;
 import org.eclipse.jgit.internal.transport.sshd.JGitPasswordAuthFactory;
 import org.eclipse.jgit.internal.transport.sshd.JGitPublicKeyAuthFactory;
 import org.eclipse.jgit.internal.transport.sshd.JGitServerKeyVerifier;
@@ -217,7 +216,6 @@ public SshdSession getSession(URIish uri,
 						new JGitUserInteraction(credentialsProvider));
 				client.setUserAuthFactories(getUserAuthFactories());
 				client.setKeyIdentityProvider(defaultKeysProvider);
-				client.setKexExtensionHandler(JGitKexExtensionHandler.INSTANCE);
 				// JGit-specific things:
 				JGitSshClient jgitClient = (JGitSshClient) client;
 				jgitClient.setKeyCache(getKeyCache());
diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
index be16ab0..df6d24f 100644
--- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
@@ -3,18 +3,18 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test
 Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)",
- org.eclipse.jgit.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.junit;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.junit.ssh;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lib;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.junit;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.junit.ssh;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+ org.hamcrest;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.experimental.theories;version="[4.13,5.0.0)",
  org.junit.runner;version="[4.13,5.0.0)"
-Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)"
diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml
index 8c6533c..332006e 100644
--- a/org.eclipse.jgit.ssh.jsch.test/pom.xml
+++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ssh.jsch.test</artifactId>
diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
index 0ae2867..1391a7e 100644
--- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
@@ -3,24 +3,24 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.ssh.jsch
 Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch;singleton:=true
-Fragment-Host: org.eclipse.jgit;bundle-version="[5.12.1,5.13.0)"
+Fragment-Host: org.eclipse.jgit;bundle-version="[5.13.0,5.14.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.jgit.internal.transport.jsch;version="5.12.1";x-friends:="org.eclipse.egit.core",
- org.eclipse.jgit.transport;version="5.12.1";
+Export-Package: org.eclipse.jgit.internal.transport.jsch;version="5.13.0";x-friends:="org.eclipse.egit.core",
+ org.eclipse.jgit.transport;version="5.13.0";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.internal.transport.ssh,
    org.eclipse.jgit.util,
    com.jcraft.jsch"
 Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)",
- org.eclipse.jgit.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.transport.ssh;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.nls;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util.io;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.transport.ssh;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util.io;version="[5.13.0,5.14.0)",
  org.slf4j;version="[1.7.0,2.0.0)"
diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF
index 8a4342b..26d1b10 100644
--- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources
 Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.12.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.12.1.qualifier";roots="."
+Bundle-Version: 5.13.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.13.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml
index 2bbbe64..813c2dc 100644
--- a/org.eclipse.jgit.ssh.jsch/pom.xml
+++ b/org.eclipse.jgit.ssh.jsch/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ssh.jsch</artifactId>
diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index 2fba2d3..f8da0f9 100644
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.test
 Bundle-SymbolicName: org.eclipse.jgit.test
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -16,59 +16,61 @@
  org.apache.commons.compress.compressors.gzip;version="[1.15.0,2.0)",
  org.apache.commons.compress.compressors.xz;version="[1.15.0,2.0)",
  org.assertj.core.api;version="[3.14.0,4.0.0)",
- org.eclipse.jgit.annotations;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.api;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.archive;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.attributes;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.awtui;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.blame;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.diff;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.dircache;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.events;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.fnmatch;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.gitrepo;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.hooks;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.ignore;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.ignore.internal;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.fsck;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.revwalk;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.io;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.pack;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.transport.connectivity;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.transport.http;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.internal.transport.parser;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.junit;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.junit.time;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lfs;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lib;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lib.internal;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.logging;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.merge;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.nls;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.notes;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.patch;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.pgm;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.pgm.internal;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.revplot;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.revwalk.filter;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.storage.file;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.storage.pack;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.submodule;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport.http;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport.resolver;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.treewalk;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util.io;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util.sha1;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.annotations;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.api;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.api.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.archive;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.attributes;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.awtui;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.blame;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.diff;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.dircache;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.events;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.fnmatch;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.gitrepo;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.hooks;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.ignore;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.ignore.internal;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.fsck;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.revwalk;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.io;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.transport.connectivity;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.transport.http;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.internal.transport.parser;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.junit;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.junit.time;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lfs;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lib.internal;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.logging;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.merge;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.notes;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.patch;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.pgm;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.pgm.internal;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.revplot;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.revwalk.filter;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.storage.file;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.storage.pack;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.submodule;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport.http;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util.io;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util.sha1;version="[5.13.0,5.14.0)",
+ org.hamcrest;version="[1.1.0,3.0.0)",
+ org.hamcrest.collection;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.experimental.theories;version="[4.13,5.0.0)",
  org.junit.function;version="[4.13.0,5.0.0)",
@@ -82,5 +84,3 @@
  org.objenesis;version="[2.6.0,3.0.0)",
  org.slf4j;version="[1.7.0,2.0.0)",
  org.tukaani.xz;version="[1.6.0,2.0)"
-Require-Bundle: org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
- org.hamcrest.library;bundle-version="[1.1.0,2.0.0)"
diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml
index 3224e99..d403c95 100644
--- a/org.eclipse.jgit.test/pom.xml
+++ b/org.eclipse.jgit.test/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.test</artifactId>
@@ -60,9 +60,9 @@
 
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
+      <artifactId>hamcrest</artifactId>
       <scope>test</scope>
-      <version>[1.1.0,2.0.0)</version>
+      <version>${hamcrest-version}</version>
     </dependency>
 
     <dependency>
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java
index 62824d3..b694f4a 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2020 Google Inc. and others
+ * Copyright (C) 2010, 2021 Google Inc. and others
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0 which is available at
@@ -18,6 +18,8 @@
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.Status;
@@ -34,8 +36,12 @@
 import org.eclipse.jgit.patch.HunkHeader;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.storage.file.FileBasedConfig;
+import org.eclipse.jgit.treewalk.CanonicalTreeParser;
 import org.eclipse.jgit.treewalk.FileTreeIterator;
+import org.eclipse.jgit.treewalk.filter.OrTreeFilter;
 import org.eclipse.jgit.treewalk.filter.PathFilter;
+import org.eclipse.jgit.treewalk.filter.PathSuffixFilter;
+import org.eclipse.jgit.treewalk.filter.TreeFilter;
 import org.eclipse.jgit.util.FileUtils;
 import org.eclipse.jgit.util.RawParseUtils;
 import org.eclipse.jgit.util.io.DisabledOutputStream;
@@ -492,6 +498,68 @@ public void testTrackedFileInIgnoredFolderUnchanged()
 	}
 
 	@Test
+	public void testFilter() throws Exception {
+		RevCommit parent;
+		RevCommit head;
+		try (Git git = new Git(db)) {
+			writeTrashFile("foo.txt", "foo\n");
+			writeTrashFile("src/some.txt", "some\n");
+			writeTrashFile("src/image.png", "image\n");
+			writeTrashFile("src/test.pdf", "test\n");
+			writeTrashFile("src/xyz.txt", "xyz\n");
+			git.add().addFilepattern(".").call();
+			parent = git.commit().setMessage("initial").call();
+			writeTrashFile("foo.txt", "FOO\n");
+			writeTrashFile("src/some.txt", "SOME\n");
+			writeTrashFile("src/image.png", "IMAGE\n");
+			writeTrashFile("src/test.pdf", "TEST\n");
+			writeTrashFile("src/xyz.txt", "XYZ\n");
+			git.add().addFilepattern(".").call();
+			head = git.commit().setMessage("second").call();
+		}
+		try (ByteArrayOutputStream os = new ByteArrayOutputStream();
+				DiffFormatter dfmt = new DiffFormatter(os)) {
+			dfmt.setRepository(db);
+			List<TreeFilter> skip = new ArrayList<>();
+			skip.add(PathSuffixFilter.create(".png"));
+			skip.add(PathSuffixFilter.create(".pdf"));
+			dfmt.setPathFilter(OrTreeFilter.create(skip).negate());
+			dfmt.format(
+					new CanonicalTreeParser(null, db.newObjectReader(),
+							parent.getTree()),
+					new CanonicalTreeParser(null, db.newObjectReader(),
+							head.getTree()));
+			dfmt.flush();
+
+			String actual = os.toString("UTF-8");
+
+			String expected = "diff --git a/foo.txt b/foo.txt\n"
+					+ "index 257cc56..b7d6715 100644\n"
+					+ "--- a/foo.txt\n"
+					+ "+++ b/foo.txt\n"
+					+ "@@ -1 +1 @@\n"
+					+ "-foo\n"
+					+ "+FOO\n"
+					+ "diff --git a/src/some.txt b/src/some.txt\n"
+					+ "index 363ef61..76cea5f 100644\n"
+					+ "--- a/src/some.txt\n"
+					+ "+++ b/src/some.txt\n"
+					+ "@@ -1 +1 @@\n"
+					+ "-some\n"
+					+ "+SOME\n"
+					+ "diff --git a/src/xyz.txt b/src/xyz.txt\n"
+					+ "index cd470e6..d4e3ab0 100644\n"
+					+ "--- a/src/xyz.txt\n"
+					+ "+++ b/src/xyz.txt\n"
+					+ "@@ -1 +1 @@\n"
+					+ "-xyz\n"
+					+ "+XYZ\n";
+
+			assertEquals(expected, actual);
+		}
+	}
+
+	@Test
 	public void testTrackedFileInIgnoredFolderChanged()
 			throws Exception {
 		String expectedDiff = "diff --git a/empty/empty/foo b/empty/empty/foo\n"
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackWriterTest.java
index e422ab9..71aca9d 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackWriterTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackWriterTest.java
@@ -18,6 +18,10 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -25,6 +29,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.text.ParseException;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -32,6 +37,7 @@
 import java.util.List;
 import java.util.Set;
 
+import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.errors.MissingObjectException;
 import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry;
 import org.eclipse.jgit.internal.storage.pack.PackExt;
@@ -43,6 +49,7 @@
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.ObjectIdSet;
 import org.eclipse.jgit.lib.ObjectInserter;
+import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.lib.Sets;
 import org.eclipse.jgit.revwalk.DepthWalk;
@@ -58,6 +65,7 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 public class PackWriterTest extends SampleDataRepositoryTestCase {
 
@@ -626,6 +634,131 @@ public void testShallowFetchShallowAncestorDepth2() throws Exception {
 		}
 	}
 
+	@Test
+	public void testTotalPackFilesScanWhenSearchForReuseTimeoutNotSet()
+			throws Exception {
+		FileRepository fileRepository = setUpRepoWithMultiplePackfiles();
+		PackWriter mockedPackWriter = Mockito
+				.spy(new PackWriter(config, fileRepository.newObjectReader()));
+
+		doNothing().when(mockedPackWriter).select(any(), any());
+
+		try (FileOutputStream packOS = new FileOutputStream(
+				getPackFileToWrite(fileRepository, mockedPackWriter))) {
+			mockedPackWriter.writePack(NullProgressMonitor.INSTANCE,
+					NullProgressMonitor.INSTANCE, packOS);
+		}
+
+		long numberOfPackFiles = new GC(fileRepository)
+				.getStatistics().numberOfPackFiles;
+		int expectedSelectCalls =
+				// Objects contained in multiple packfiles * number of packfiles
+				2 * (int) numberOfPackFiles +
+				// Objects in single packfile
+						1;
+		verify(mockedPackWriter, times(expectedSelectCalls)).select(any(),
+				any());
+	}
+
+	@Test
+	public void testTotalPackFilesScanWhenSkippingSearchForReuseTimeoutCheck()
+			throws Exception {
+		FileRepository fileRepository = setUpRepoWithMultiplePackfiles();
+		PackConfig packConfig = new PackConfig();
+		packConfig.setSearchForReuseTimeout(Duration.ofSeconds(-1));
+		PackWriter mockedPackWriter = Mockito.spy(
+				new PackWriter(packConfig, fileRepository.newObjectReader()));
+
+		doNothing().when(mockedPackWriter).select(any(), any());
+
+		try (FileOutputStream packOS = new FileOutputStream(
+				getPackFileToWrite(fileRepository, mockedPackWriter))) {
+			mockedPackWriter.writePack(NullProgressMonitor.INSTANCE,
+					NullProgressMonitor.INSTANCE, packOS);
+		}
+
+		long numberOfPackFiles = new GC(fileRepository)
+				.getStatistics().numberOfPackFiles;
+		int expectedSelectCalls =
+				// Objects contained in multiple packfiles * number of packfiles
+				2 * (int) numberOfPackFiles +
+				// Objects contained in single packfile
+						1;
+		verify(mockedPackWriter, times(expectedSelectCalls)).select(any(),
+				any());
+	}
+
+	@Test
+	public void testPartialPackFilesScanWhenDoingSearchForReuseTimeoutCheck()
+			throws Exception {
+		FileRepository fileRepository = setUpRepoWithMultiplePackfiles();
+		PackConfig packConfig = new PackConfig();
+		packConfig.setSearchForReuseTimeout(Duration.ofSeconds(-1));
+		PackWriter mockedPackWriter = Mockito.spy(
+				new PackWriter(packConfig, fileRepository.newObjectReader()));
+		mockedPackWriter.enableSearchForReuseTimeout();
+
+		doNothing().when(mockedPackWriter).select(any(), any());
+
+		try (FileOutputStream packOS = new FileOutputStream(
+				getPackFileToWrite(fileRepository, mockedPackWriter))) {
+			mockedPackWriter.writePack(NullProgressMonitor.INSTANCE,
+					NullProgressMonitor.INSTANCE, packOS);
+		}
+
+		int expectedSelectCalls = 3; // Objects in packfiles
+		verify(mockedPackWriter, times(expectedSelectCalls)).select(any(),
+				any());
+	}
+
+	/**
+	 * Creates objects and packfiles in the following order:
+	 * <ul>
+	 * <li>Creates 2 objects (C1 = commit, T1 = tree)
+	 * <li>Creates packfile P1 (containing C1, T1)
+	 * <li>Creates 1 object (C2 commit)
+	 * <li>Creates packfile P2 (containing C1, T1, C2)
+	 * <li>Create 1 object (C3 commit)
+	 * </ul>
+	 *
+	 * @throws Exception
+	 */
+	private FileRepository setUpRepoWithMultiplePackfiles() throws Exception {
+		FileRepository fileRepository = createWorkRepository();
+		try (Git git = new Git(fileRepository)) {
+			// Creates 2 objects (C1 = commit, T1 = tree)
+			git.commit().setMessage("First commit").call();
+			GC gc = new GC(fileRepository);
+			gc.setPackExpireAgeMillis(Long.MAX_VALUE);
+			gc.setExpireAgeMillis(Long.MAX_VALUE);
+			// Creates packfile P1 (containing C1, T1)
+			gc.gc();
+			// Creates 1 object (C2 commit)
+			git.commit().setMessage("Second commit").call();
+			// Creates packfile P2 (containing C1, T1, C2)
+			gc.gc();
+			// Create 1 object (C3 commit)
+			git.commit().setMessage("Third commit").call();
+		}
+		return fileRepository;
+	}
+
+	private PackFile getPackFileToWrite(FileRepository fileRepository,
+			PackWriter mockedPackWriter) throws IOException {
+		File packdir = fileRepository.getObjectDatabase().getPackDirectory();
+		PackFile packFile = new PackFile(packdir,
+				mockedPackWriter.computeName(), PackExt.PACK);
+
+		Set<ObjectId> all = new HashSet<>();
+		for (Ref r : fileRepository.getRefDatabase().getRefs()) {
+			all.add(r.getObjectId());
+		}
+
+		mockedPackWriter.preparePack(NullProgressMonitor.INSTANCE, all,
+				PackWriter.NONE);
+		return packFile;
+	}
+
 	private FileRepository setupRepoForShallowFetch() throws Exception {
 		FileRepository repo = createBareRepository();
 		// TestRepository will close the repo, but we need to return an open
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java
index 327b554..fe3c1db 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java
@@ -34,6 +34,7 @@
 import static org.junit.Assert.fail;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.text.MessageFormat;
@@ -50,6 +51,7 @@
 import org.eclipse.jgit.api.MergeCommand.FastForwardMode;
 import org.eclipse.jgit.errors.ConfigInvalidException;
 import org.eclipse.jgit.internal.JGitText;
+import org.eclipse.jgit.junit.JGitTestUtil;
 import org.eclipse.jgit.junit.MockSystemReader;
 import org.eclipse.jgit.merge.MergeConfig;
 import org.eclipse.jgit.storage.file.FileBasedConfig;
@@ -1463,6 +1465,107 @@ public void testWhitespaceContinuation() throws ConfigInvalidException {
 		assertEquals("tr   ue", parseEscapedValue("tr \\\r\n  ue"));
 	}
 
+	@Test
+	public void testCommitTemplateEmptyConfig()
+			throws ConfigInvalidException, IOException {
+		// no values defined nowhere
+		Config config = new Config(null);
+		assertNull(config.get(CommitConfig.KEY).getCommitTemplatePath());
+		assertNull(config.get(CommitConfig.KEY).getCommitTemplateContent());
+	}
+
+	@Test
+	public void testCommitTemplateConfig()
+			throws ConfigInvalidException, IOException {
+
+		File tempFile = tmp.newFile("testCommitTemplate-");
+		String templateContent = "content of the template";
+		JGitTestUtil.write(tempFile, templateContent);
+		String expectedTemplatePath = tempFile.getPath();
+
+		Config config = parse(
+				"[commit]\n\ttemplate = " + expectedTemplatePath + "\n");
+
+		String templatePath = config.get(CommitConfig.KEY)
+				.getCommitTemplatePath();
+		String commitEncoding = config.get(CommitConfig.KEY)
+				.getCommitEncoding();
+		assertEquals(expectedTemplatePath, templatePath);
+		assertEquals(templateContent,
+				config.get(CommitConfig.KEY).getCommitTemplateContent());
+		assertNull("no commitEncoding has been set so it must be null",
+				commitEncoding);
+	}
+
+	@Test
+	public void testCommitTemplateEncoding()
+			throws ConfigInvalidException, IOException {
+		Config config = new Config(null);
+		File tempFile = tmp.newFile("testCommitTemplate-");
+		String templateContent = "content of the template";
+		JGitTestUtil.write(tempFile, templateContent);
+		String expectedTemplatePath = tempFile.getPath();
+		config = parse("[i18n]\n\tcommitEncoding = utf-8\n"
+				+ "[commit]\n\ttemplate = " + expectedTemplatePath + "\n");
+		assertEquals(templateContent,
+				config.get(CommitConfig.KEY).getCommitTemplateContent());
+		String commitEncoding = config.get(CommitConfig.KEY)
+				.getCommitEncoding();
+		assertEquals("commitEncoding has been set to utf-8 it must be utf-8",
+				"utf-8", commitEncoding);
+	}
+
+	@Test
+	public void testCommitTemplatePathInHomeDirecory()
+			throws ConfigInvalidException, IOException {
+		Config config = new Config(null);
+		File tempFile = tmp.newFile("testCommitTemplate-");
+		String templateContent = "content of the template";
+		JGitTestUtil.write(tempFile, templateContent);
+		// proper evaluation of the ~/ directory
+		String homeDir = System.getProperty("user.home");
+		File tempFileInHomeDirectory = File.createTempFile("fileInHomeFolder",
+				".tmp", new File(homeDir));
+		tempFileInHomeDirectory.deleteOnExit();
+		JGitTestUtil.write(tempFileInHomeDirectory, templateContent);
+		String expectedTemplatePath = tempFileInHomeDirectory.getPath()
+				.replace(homeDir, "~");
+		config = parse("[commit]\n\ttemplate = " + expectedTemplatePath + "\n");
+		String templatePath = config.get(CommitConfig.KEY)
+				.getCommitTemplatePath();
+		assertEquals(expectedTemplatePath, templatePath);
+		assertEquals(templateContent,
+				config.get(CommitConfig.KEY).getCommitTemplateContent());
+	}
+
+	@Test(expected = ConfigInvalidException.class)
+	public void testCommitTemplateWithInvalidEncoding()
+			throws ConfigInvalidException, IOException {
+		Config config = new Config(null);
+		File tempFile = tmp.newFile("testCommitTemplate-");
+		String templateContent = "content of the template";
+		JGitTestUtil.write(tempFile, templateContent);
+		config = parse("[i18n]\n\tcommitEncoding = invalidEcoding\n"
+				+ "[commit]\n\ttemplate = " + tempFile.getPath() + "\n");
+		config.get(CommitConfig.KEY).getCommitTemplateContent();
+	}
+
+	@Test(expected = FileNotFoundException.class)
+	public void testCommitTemplateWithInvalidPath()
+			throws ConfigInvalidException, IOException {
+		Config config = new Config(null);
+		File tempFile = tmp.newFile("testCommitTemplate-");
+		String templateContent = "content of the template";
+		JGitTestUtil.write(tempFile, templateContent);
+		// commit message encoding
+		String expectedTemplatePath = "nonExistingTemplate";
+		config = parse("[commit]\n\ttemplate = " + expectedTemplatePath + "\n");
+		String templatePath = config.get(CommitConfig.KEY)
+				.getCommitTemplatePath();
+		assertEquals(expectedTemplatePath, templatePath);
+		config.get(CommitConfig.KEY).getCommitTemplateContent();
+	}
+
 	private static void assertValueRoundTrip(String value)
 			throws ConfigInvalidException {
 		assertValueRoundTrip(value, value);
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ObjectIdMatcher.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ObjectIdMatcher.java
index c3df19a..77e8afb 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ObjectIdMatcher.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ObjectIdMatcher.java
@@ -16,7 +16,6 @@
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.Sets;
 import org.hamcrest.Description;
-import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
 
@@ -59,7 +58,6 @@ protected boolean matchesSafely(Collection<ObjectId> resultOids) {
 	 * @return true if examined and specified sets contains exactly the same
 	 *         elements.
 	 */
-	@Factory
 	static Matcher<Collection<ObjectId>> hasOnlyObjectIds(
 			String... oids) {
 		return new ObjectIdMatcher(Sets.of(oids));
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java
index 5045e94..f4bbb4c 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java
@@ -460,6 +460,8 @@ private static class TestV2Hook implements ProtocolV2Hook {
 
 		private FetchV2Request fetchRequest;
 
+		private ObjectInfoRequest objectInfoRequest;
+
 		@Override
 		public void onCapabilities(CapabilitiesV2Request req) {
 			capabilitiesRequest = req;
@@ -474,6 +476,11 @@ public void onLsRefs(LsRefsV2Request req) {
 		public void onFetch(FetchV2Request req) {
 			fetchRequest = req;
 		}
+
+		@Override
+		public void onObjectInfo(ObjectInfoRequest req) {
+			objectInfoRequest = req;
+		}
 	}
 
 	@Test
@@ -999,6 +1006,108 @@ public void testV2FetchClientStopsNegotiation() throws Exception {
 	}
 
 	@Test
+	public void testV2FetchWithoutWaitForDoneReceivesPackfile()
+			throws Exception {
+		String commonInBlob = "abcdefghijklmnopqrstuvwxyz";
+
+		RevBlob parentBlob = remote.blob(commonInBlob + "a");
+		RevCommit parent = remote
+				.commit(remote.tree(remote.file("foo", parentBlob)));
+		remote.update("branch1", parent);
+
+		RevCommit localParent = null;
+		RevCommit localChild = null;
+		try (TestRepository<InMemoryRepository> local = new TestRepository<>(
+				client)) {
+			RevBlob localParentBlob = local.blob(commonInBlob + "a");
+			localParent = local
+					.commit(local.tree(local.file("foo", localParentBlob)));
+			RevBlob localChildBlob = local.blob(commonInBlob + "b");
+			localChild = local.commit(
+					local.tree(local.file("foo", localChildBlob)), localParent);
+			local.update("branch1", localChild);
+		}
+
+		ByteArrayInputStream recvStream = uploadPackV2("command=fetch\n",
+				PacketLineIn.delimiter(),
+				"have " + localParent.toObjectId().getName() + "\n",
+				"have " + localChild.toObjectId().getName() + "\n",
+				PacketLineIn.end());
+		PacketLineIn pckIn = new PacketLineIn(recvStream);
+		assertThat(pckIn.readString(), is("acknowledgments"));
+		assertThat(Arrays.asList(pckIn.readString()),
+				hasItems("ACK " + parent.toObjectId().getName()));
+		assertThat(pckIn.readString(), is("ready"));
+		assertTrue(PacketLineIn.isDelimiter(pckIn.readString()));
+		assertThat(pckIn.readString(), is("packfile"));
+		parsePack(recvStream);
+	}
+
+	@Test
+	public void testV2FetchWithWaitForDoneOnlyDoesNegotiation()
+			throws Exception {
+		String commonInBlob = "abcdefghijklmnopqrstuvwxyz";
+
+		RevBlob parentBlob = remote.blob(commonInBlob + "a");
+		RevCommit parent = remote
+				.commit(remote.tree(remote.file("foo", parentBlob)));
+		remote.update("branch1", parent);
+
+		RevCommit localParent = null;
+		RevCommit localChild = null;
+		try (TestRepository<InMemoryRepository> local = new TestRepository<>(
+				client)) {
+			RevBlob localParentBlob = local.blob(commonInBlob + "a");
+			localParent = local
+					.commit(local.tree(local.file("foo", localParentBlob)));
+			RevBlob localChildBlob = local.blob(commonInBlob + "b");
+			localChild = local.commit(
+					local.tree(local.file("foo", localChildBlob)), localParent);
+			local.update("branch1", localChild);
+		}
+
+		ByteArrayInputStream recvStream = uploadPackV2("command=fetch\n",
+				PacketLineIn.delimiter(), "wait-for-done\n",
+				"have " + localParent.toObjectId().getName() + "\n",
+				"have " + localChild.toObjectId().getName() + "\n",
+				PacketLineIn.end());
+		PacketLineIn pckIn = new PacketLineIn(recvStream);
+		assertThat(pckIn.readString(), is("acknowledgments"));
+		assertThat(Arrays.asList(pckIn.readString()),
+				hasItems("ACK " + parent.toObjectId().getName()));
+		assertTrue(PacketLineIn.isEnd(pckIn.readString()));
+	}
+
+	@Test
+	public void testV2FetchWithWaitForDoneOnlyDoesNegotiationAndNothingToAck()
+			throws Exception {
+		String commonInBlob = "abcdefghijklmnopqrstuvwxyz";
+
+		RevCommit localParent = null;
+		RevCommit localChild = null;
+		try (TestRepository<InMemoryRepository> local = new TestRepository<>(
+				client)) {
+			RevBlob localParentBlob = local.blob(commonInBlob + "a");
+			localParent = local
+					.commit(local.tree(local.file("foo", localParentBlob)));
+			RevBlob localChildBlob = local.blob(commonInBlob + "b");
+			localChild = local.commit(
+					local.tree(local.file("foo", localChildBlob)), localParent);
+			local.update("branch1", localChild);
+		}
+
+		ByteArrayInputStream recvStream = uploadPackV2("command=fetch\n",
+				PacketLineIn.delimiter(), "wait-for-done\n",
+				"have " + localParent.toObjectId().getName() + "\n",
+				"have " + localChild.toObjectId().getName() + "\n",
+				PacketLineIn.end());
+		PacketLineIn pckIn = new PacketLineIn(recvStream);
+		assertThat(pckIn.readString(), is("acknowledgments"));
+		assertThat(pckIn.readString(), is("NAK"));
+		assertTrue(PacketLineIn.isEnd(pckIn.readString()));
+	}
+
+	@Test
 	public void testV2FetchThinPack() throws Exception {
 		String commonInBlob = "abcdefghijklmnopqrstuvwxyz";
 
@@ -2539,4 +2648,44 @@ public RefDatabase getRefDatabase() {
 			return refdb;
 		}
 	}
+
+	@Test
+	public void testObjectInfo() throws Exception {
+		server.getConfig().setBoolean("uploadpack", null, "advertiseobjectinfo",
+				true);
+
+		RevBlob blob1 = remote.blob("foobar");
+		RevBlob blob2 = remote.blob("fooba");
+		RevTree tree = remote.tree(remote.file("1", blob1),
+				remote.file("2", blob2));
+		RevCommit commit = remote.commit(tree);
+		remote.update("master", commit);
+
+		TestV2Hook hook = new TestV2Hook();
+		ByteArrayInputStream recvStream = uploadPackV2((UploadPack up) -> {
+			up.setProtocolV2Hook(hook);
+		}, "command=object-info\n", "size",
+				"oid " + ObjectId.toString(blob1.getId()),
+				"oid " + ObjectId.toString(blob2.getId()), PacketLineIn.end());
+		PacketLineIn pckIn = new PacketLineIn(recvStream);
+
+		assertThat(hook.objectInfoRequest, notNullValue());
+		assertThat(pckIn.readString(), is("size"));
+		assertThat(pckIn.readString(),
+				is(ObjectId.toString(blob1.getId()) + " 6"));
+		assertThat(pckIn.readString(),
+				is(ObjectId.toString(blob2.getId()) + " 5"));
+		assertTrue(PacketLineIn.isEnd(pckIn.readString()));
+	}
+
+	@Test
+	public void testObjectInfo_invalidOid() throws Exception {
+		server.getConfig().setBoolean("uploadpack", null, "advertiseobjectinfo",
+				true);
+
+		assertThrows(UploadPackInternalServerErrorException.class,
+				() -> uploadPackV2("command=object-info\n", "size",
+						"oid invalid",
+						PacketLineIn.end()));
+	}
 }
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/filter/PathSuffixFilterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/filter/PathSuffixFilterTest.java
index d813391..0b5a735 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/filter/PathSuffixFilterTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/filter/PathSuffixFilterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2013 Google Inc. and others
+ * Copyright (C) 2009, 2021 Google Inc. and others
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0 which is available at
@@ -41,10 +41,11 @@ public void testNonRecursiveFiltering() throws IOException {
 
 	@Test
 	public void testRecursiveFiltering() throws IOException {
-		ObjectId treeId = createTree("a.sth", "a.txt", "sub/b.sth", "sub/b.txt");
+		ObjectId treeId = createTree("a.sth", "a.txt", "sub/b.sth", "sub/b.txt",
+				"t.sth", "t.txt");
 
 		List<String> paths = getMatchingPaths(".txt", treeId, true);
-		List<String> expected = Arrays.asList("a.txt", "sub/b.txt");
+		List<String> expected = Arrays.asList("a.txt", "sub/b.txt", "t.txt");
 
 		assertEquals(expected, paths);
 	}
@@ -59,6 +60,17 @@ public void testEdgeCases() throws IOException {
 		assertEquals(Arrays.asList("abc", "c"), getMatchingPaths("c", treeId));
 	}
 
+	@Test
+	public void testNegated() throws IOException {
+		ObjectId treeId = createTree("a.sth", "a.txt", "sub/b.sth",
+				"sub/b.txt", "t.sth", "t.txt");
+
+		List<String> paths = getMatchingPaths(".txt", treeId, true, true);
+		List<String> expected = Arrays.asList("a.sth", "sub/b.sth", "t.sth");
+
+		assertEquals(expected, paths);
+	}
+
 	private ObjectId createTree(String... paths) throws IOException {
 		final ObjectInserter odi = db.newObjectInserter();
 		final DirCache dc = db.readDirCache();
@@ -80,8 +92,18 @@ private List<String> getMatchingPaths(String suffixFilter,
 
 	private List<String> getMatchingPaths(String suffixFilter,
 			final ObjectId treeId, boolean recursiveWalk) throws IOException {
+		return getMatchingPaths(suffixFilter, treeId, recursiveWalk, false);
+	}
+
+	private List<String> getMatchingPaths(String suffixFilter,
+			final ObjectId treeId, boolean recursiveWalk, boolean negated)
+			throws IOException {
 		try (TreeWalk tw = new TreeWalk(db)) {
-			tw.setFilter(PathSuffixFilter.create(suffixFilter));
+			TreeFilter filter = PathSuffixFilter.create(suffixFilter);
+			if (negated) {
+				filter = filter.negate();
+			}
+			tw.setFilter(filter);
 			tw.setRecursive(recursiveWalk);
 			tw.addTree(treeId);
 
diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
index 8588995..be2e2b0 100644
--- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
@@ -4,14 +4,14 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.ui
 Bundle-SymbolicName: org.eclipse.jgit.ui
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.jgit.awtui;version="5.12.1"
-Import-Package: org.eclipse.jgit.errors;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.lib;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.nls;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.revplot;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.transport;version="[5.12.1,5.13.0)",
- org.eclipse.jgit.util;version="[5.12.1,5.13.0)"
+Export-Package: org.eclipse.jgit.awtui;version="5.13.0"
+Import-Package: org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.revplot;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.util;version="[5.13.0,5.14.0)"
diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF
index 009ecdc..3badd8a 100644
--- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit.ui - Sources
 Bundle-SymbolicName: org.eclipse.jgit.ui.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.12.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.12.1.qualifier";roots="."
+Bundle-Version: 5.13.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.13.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml
index 7ff29f92..6ac0437 100644
--- a/org.eclipse.jgit.ui/pom.xml
+++ b/org.eclipse.jgit.ui/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ui</artifactId>
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters
index 33331fb..83a8381 100644
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.jgit" version="2">
+    <resource path="src/org/eclipse/jgit/storage/pack/PackConfig.java" type="org.eclipse.jgit.storage.pack.PackConfig">
+        <filter id="336658481">
+            <message_arguments>
+                <message_argument value="org.eclipse.jgit.storage.pack.PackConfig"/>
+                <message_argument value="DEFAULT_SEARCH_FOR_REUSE_TIMEOUT"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/jgit/transport/ProtocolV2Hook.java" type="org.eclipse.jgit.transport.ProtocolV2Hook">
+        <filter id="404000815">
+            <message_arguments>
+                <message_argument value="org.eclipse.jgit.transport.ProtocolV2Hook"/>
+                <message_argument value="onObjectInfo(ObjectInfoRequest)"/>
+            </message_arguments>
+        </filter>
+    </resource>
     <resource path="src/org/eclipse/jgit/transport/SshConstants.java" type="org.eclipse.jgit.transport.SshConstants">
         <filter id="1142947843">
             <message_arguments>
diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index 9a5793a..1e7ba91 100644
--- a/org.eclipse.jgit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF
@@ -3,12 +3,12 @@
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit
 Bundle-SymbolicName: org.eclipse.jgit
-Bundle-Version: 5.12.1.qualifier
+Bundle-Version: 5.13.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
 Eclipse-ExtensibleAPI: true
-Export-Package: org.eclipse.jgit.annotations;version="5.12.1",
- org.eclipse.jgit.api;version="5.12.1";
+Export-Package: org.eclipse.jgit.annotations;version="5.13.0",
+ org.eclipse.jgit.api;version="5.13.0";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.notes,
    org.eclipse.jgit.dircache,
@@ -23,18 +23,18 @@
    org.eclipse.jgit.revwalk.filter,
    org.eclipse.jgit.blame,
    org.eclipse.jgit.merge",
- org.eclipse.jgit.api.errors;version="5.12.1";
+ org.eclipse.jgit.api.errors;version="5.13.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.errors",
- org.eclipse.jgit.attributes;version="5.12.1";
+ org.eclipse.jgit.attributes;version="5.13.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.treewalk",
- org.eclipse.jgit.blame;version="5.12.1";
+ org.eclipse.jgit.blame;version="5.13.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.diff",
- org.eclipse.jgit.diff;version="5.12.1";
+ org.eclipse.jgit.diff;version="5.13.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.attributes,
    org.eclipse.jgit.revwalk,
@@ -42,44 +42,44 @@
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.util",
- org.eclipse.jgit.dircache;version="5.12.1";
+ org.eclipse.jgit.dircache;version="5.13.0";
   uses:="org.eclipse.jgit.events,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.attributes,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.util",
- org.eclipse.jgit.errors;version="5.12.1";
+ org.eclipse.jgit.errors;version="5.13.0";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.dircache,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.internal.storage.pack",
- org.eclipse.jgit.events;version="5.12.1";
+ org.eclipse.jgit.events;version="5.13.0";
   uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.fnmatch;version="5.12.1",
- org.eclipse.jgit.gitrepo;version="5.12.1";
+ org.eclipse.jgit.fnmatch;version="5.13.0",
+ org.eclipse.jgit.gitrepo;version="5.13.0";
   uses:="org.xml.sax.helpers,
    org.eclipse.jgit.api,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
    org.xml.sax",
- org.eclipse.jgit.gitrepo.internal;version="5.12.1";x-internal:=true,
- org.eclipse.jgit.hooks;version="5.12.1";uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.ignore;version="5.12.1",
- org.eclipse.jgit.ignore.internal;version="5.12.1";
+ org.eclipse.jgit.gitrepo.internal;version="5.13.0";x-internal:=true,
+ org.eclipse.jgit.hooks;version="5.13.0";uses:="org.eclipse.jgit.lib",
+ org.eclipse.jgit.ignore;version="5.13.0",
+ org.eclipse.jgit.ignore.internal;version="5.13.0";
   x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal;version="5.12.1";
+ org.eclipse.jgit.internal;version="5.13.0";
   x-friends:="org.eclipse.jgit.test,
    org.eclipse.jgit.http.test",
- org.eclipse.jgit.internal.fsck;version="5.12.1";
+ org.eclipse.jgit.internal.fsck;version="5.13.0";
   x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.revwalk;version="5.12.1";
+ org.eclipse.jgit.internal.revwalk;version="5.13.0";
   x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.storage.dfs;version="5.12.1";
+ org.eclipse.jgit.internal.storage.dfs;version="5.13.0";
   x-friends:="org.eclipse.jgit.test,
    org.eclipse.jgit.http.server,
    org.eclipse.jgit.http.test,
    org.eclipse.jgit.lfs.test",
- org.eclipse.jgit.internal.storage.file;version="5.12.1";
+ org.eclipse.jgit.internal.storage.file;version="5.13.0";
   x-friends:="org.eclipse.jgit.test,
    org.eclipse.jgit.junit,
    org.eclipse.jgit.junit.http,
@@ -88,31 +88,31 @@
    org.eclipse.jgit.pgm,
    org.eclipse.jgit.pgm.test,
    org.eclipse.jgit.ssh.apache",
- org.eclipse.jgit.internal.storage.io;version="5.12.1";
+ org.eclipse.jgit.internal.storage.io;version="5.13.0";
   x-friends:="org.eclipse.jgit.junit,
    org.eclipse.jgit.test,
    org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.pack;version="5.12.1";
+ org.eclipse.jgit.internal.storage.pack;version="5.13.0";
   x-friends:="org.eclipse.jgit.junit,
    org.eclipse.jgit.test,
    org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.reftable;version="5.12.1";
+ org.eclipse.jgit.internal.storage.reftable;version="5.13.0";
   x-friends:="org.eclipse.jgit.http.test,
    org.eclipse.jgit.junit,
    org.eclipse.jgit.test,
    org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.submodule;version="5.12.1";x-internal:=true,
- org.eclipse.jgit.internal.transport.connectivity;version="5.12.1";
+ org.eclipse.jgit.internal.submodule;version="5.13.0";x-internal:=true,
+ org.eclipse.jgit.internal.transport.connectivity;version="5.13.0";
   x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.http;version="5.12.1";
+ org.eclipse.jgit.internal.transport.http;version="5.13.0";
   x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.parser;version="5.12.1";
+ org.eclipse.jgit.internal.transport.parser;version="5.13.0";
   x-friends:="org.eclipse.jgit.http.server,
    org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.ssh;version="5.12.1";
+ org.eclipse.jgit.internal.transport.ssh;version="5.13.0";
   x-friends:="org.eclipse.jgit.ssh.apache,
    org.eclipse.jgit.ssh.jsch",
- org.eclipse.jgit.lib;version="5.12.1";
+ org.eclipse.jgit.lib;version="5.13.0";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.util.sha1,
    org.eclipse.jgit.dircache,
@@ -126,10 +126,10 @@
    org.eclipse.jgit.util,
    org.eclipse.jgit.submodule,
    org.eclipse.jgit.util.time",
- org.eclipse.jgit.lib.internal;version="5.12.1";
+ org.eclipse.jgit.lib.internal;version="5.13.0";
   x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.logging;version="5.12.1",
- org.eclipse.jgit.merge;version="5.12.1";
+ org.eclipse.jgit.logging;version="5.13.0",
+ org.eclipse.jgit.merge;version="5.13.0";
   uses:="org.eclipse.jgit.dircache,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
@@ -138,40 +138,40 @@
    org.eclipse.jgit.util,
    org.eclipse.jgit.api,
    org.eclipse.jgit.attributes",
- org.eclipse.jgit.nls;version="5.12.1",
- org.eclipse.jgit.notes;version="5.12.1";
+ org.eclipse.jgit.nls;version="5.13.0",
+ org.eclipse.jgit.notes;version="5.13.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.merge",
- org.eclipse.jgit.patch;version="5.12.1";
+ org.eclipse.jgit.patch;version="5.13.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.diff",
- org.eclipse.jgit.revplot;version="5.12.1";
+ org.eclipse.jgit.revplot;version="5.13.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk",
- org.eclipse.jgit.revwalk;version="5.12.1";
+ org.eclipse.jgit.revwalk;version="5.13.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.diff,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.revwalk.filter,
    org.eclipse.jgit.treewalk",
- org.eclipse.jgit.revwalk.filter;version="5.12.1";
+ org.eclipse.jgit.revwalk.filter;version="5.13.0";
   uses:="org.eclipse.jgit.revwalk,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.util",
- org.eclipse.jgit.storage.file;version="5.12.1";
+ org.eclipse.jgit.storage.file;version="5.13.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.util",
- org.eclipse.jgit.storage.pack;version="5.12.1";
+ org.eclipse.jgit.storage.pack;version="5.13.0";
   uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.submodule;version="5.12.1";
+ org.eclipse.jgit.submodule;version="5.13.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.diff,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.util",
- org.eclipse.jgit.transport;version="5.12.1";
+ org.eclipse.jgit.transport;version="5.13.0";
   uses:="javax.crypto,
    org.eclipse.jgit.util.io,
    org.eclipse.jgit.lib,
@@ -184,21 +184,21 @@
    org.eclipse.jgit.transport.resolver,
    org.eclipse.jgit.storage.pack,
    org.eclipse.jgit.errors",
- org.eclipse.jgit.transport.http;version="5.12.1";
+ org.eclipse.jgit.transport.http;version="5.13.0";
   uses:="javax.net.ssl",
- org.eclipse.jgit.transport.resolver;version="5.12.1";
+ org.eclipse.jgit.transport.resolver;version="5.13.0";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.lib",
- org.eclipse.jgit.treewalk;version="5.12.1";
+ org.eclipse.jgit.treewalk;version="5.13.0";
   uses:="org.eclipse.jgit.dircache,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.attributes,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.util",
- org.eclipse.jgit.treewalk.filter;version="5.12.1";
+ org.eclipse.jgit.treewalk.filter;version="5.13.0";
   uses:="org.eclipse.jgit.treewalk",
- org.eclipse.jgit.util;version="5.12.1";
+ org.eclipse.jgit.util;version="5.13.0";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.hooks,
    org.eclipse.jgit.revwalk,
@@ -211,12 +211,12 @@
    org.eclipse.jgit.treewalk,
    javax.net.ssl,
    org.eclipse.jgit.util.time",
- org.eclipse.jgit.util.io;version="5.12.1";
+ org.eclipse.jgit.util.io;version="5.13.0";
   uses:="org.eclipse.jgit.attributes,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.treewalk",
- org.eclipse.jgit.util.sha1;version="5.12.1",
- org.eclipse.jgit.util.time;version="5.12.1"
+ org.eclipse.jgit.util.sha1;version="5.13.0",
+ org.eclipse.jgit.util.time;version="5.13.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
  javax.crypto,
diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
index 03ddbb7..34d6954 100644
--- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
 Bundle-Name: org.eclipse.jgit - Sources
 Bundle-SymbolicName: org.eclipse.jgit.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.12.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit;version="5.12.1.qualifier";roots="."
+Bundle-Version: 5.13.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit;version="5.13.0.qualifier";roots="."
diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
index c9fc127..5adaea7 100644
--- a/org.eclipse.jgit/pom.xml
+++ b/org.eclipse.jgit/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>5.12.1-SNAPSHOT</version>
+    <version>5.13.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit</artifactId>
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
index 6180737..3acceab 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
@@ -365,6 +365,7 @@
 invalidChannel=Invalid channel {0}
 invalidCommitParentNumber=Invalid commit parent number
 invalidDepth=Invalid depth: {0}
+invalidEncoding=Invalid encoding from git config i18n.commitEncoding: {0}
 invalidEncryption=Invalid encryption
 invalidExpandWildcard=ExpandFromSource on a refspec that can have mismatched wildcards does not make sense.
 invalidFilter=Invalid filter: {0}
@@ -633,6 +634,7 @@
 searchForReachableBranches=Finding reachable branches
 saveFileStoreAttributesFailed=Saving measured FileStore attributes to user config failed
 searchForReuse=Finding sources
+searchForReuseTimeout=Search for reuse timed out after {0} seconds
 searchForSizes=Getting sizes
 secondsAgo={0} seconds ago
 selectingCommits=Selecting commits
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java
index cf7bc1f..3aa7114 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java
@@ -173,7 +173,11 @@ public Git call() throws GitAPIException, InvalidRemoteException,
 		Repository repository = init();
 		FetchResult fetchResult = null;
 		Thread cleanupHook = new Thread(() -> cleanup());
-		Runtime.getRuntime().addShutdownHook(cleanupHook);
+		try {
+			Runtime.getRuntime().addShutdownHook(cleanupHook);
+		} catch (IllegalStateException e) {
+			// ignore - the VM is already shutting down
+		}
 		try {
 			fetchResult = fetch(repository, u);
 		} catch (IOException ioe) {
@@ -197,7 +201,11 @@ public Git call() throws GitAPIException, InvalidRemoteException,
 			cleanup();
 			throw e;
 		} finally {
-			Runtime.getRuntime().removeShutdownHook(cleanupHook);
+			try {
+				Runtime.getRuntime().removeShutdownHook(cleanupHook);
+			} catch (IllegalStateException e) {
+				// ignore - the VM is already shutting down
+			}
 		}
 		if (!noCheckout) {
 			try {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/SearchForReuseTimeout.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/SearchForReuseTimeout.java
new file mode 100644
index 0000000..402a850
--- /dev/null
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/SearchForReuseTimeout.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2021, Fabio Ponciroli <ponch@gerritforge.com>
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Distribution License v. 1.0 which is available at
+ * https://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+package org.eclipse.jgit.errors;
+
+import org.eclipse.jgit.internal.JGitText;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.time.Duration;
+
+/**
+ * Thrown when the search for reuse phase times out.
+ *
+ * @since 5.13
+ */
+public class SearchForReuseTimeout extends IOException {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * Construct a search for reuse timeout error.
+	 *
+	 * @param timeout
+	 *            time exceeded during the search for reuse phase.
+	 */
+	public SearchForReuseTimeout(Duration timeout) {
+		super(MessageFormat.format(JGitText.get().searchForReuseTimeout,
+				Long.valueOf(timeout.getSeconds())));
+	}
+
+	@Override
+	public synchronized Throwable fillInStackTrace() {
+		return this;
+	}
+}
\ No newline at end of file
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
index e1fa144..76340da 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
@@ -393,6 +393,7 @@ public static JGitText get() {
 	/***/ public String invalidChannel;
 	/***/ public String invalidCommitParentNumber;
 	/***/ public String invalidDepth;
+	/***/ public String invalidEncoding;
 	/***/ public String invalidEncryption;
 	/***/ public String invalidExpandWildcard;
 	/***/ public String invalidFilter;
@@ -661,6 +662,7 @@ public static JGitText get() {
 	/***/ public String saveFileStoreAttributesFailed;
 	/***/ public String searchForReachableBranches;
 	/***/ public String searchForReuse;
+	/***/ public String searchForReuseTimeout;
 	/***/ public String searchForSizes;
 	/***/ public String secondsAgo;
 	/***/ public String selectingCommits;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java
index 96ca690..b9e40cd 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java
@@ -25,6 +25,7 @@
 import java.nio.channels.Channels;
 import java.text.MessageFormat;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.zip.CRC32;
 import java.util.zip.DataFormatException;
 import java.util.zip.Inflater;
@@ -58,12 +59,8 @@ public final class DfsPackFile extends BlockBasedFile {
 	private static final int REC_SIZE = Constants.OBJECT_ID_LENGTH + 8;
 	private static final long REF_POSITION = 0;
 
-	/**
-	 * Lock for initialization of {@link #index} and {@link #corruptObjects}.
-	 * <p>
-	 * This lock ensures only one thread can perform the initialization work.
-	 */
-	private final Object initLock = new Object();
+	/** Lock for initialization of {@link #index} and {@link #reverseIndex}. */
+	private final Object indexLock = new Object();
 
 	/** Index mapping {@link ObjectId} to position within the pack stream. */
 	private volatile PackIndex index;
@@ -71,9 +68,15 @@ public final class DfsPackFile extends BlockBasedFile {
 	/** Reverse version of {@link #index} mapping position to {@link ObjectId}. */
 	private volatile PackReverseIndex reverseIndex;
 
+	/** Lock for initialization of {@link #bitmapIndex}. */
+	private final Object bitmapIndexLock = new Object();
+
 	/** Index of compressed bitmap mapping entire object graph. */
 	private volatile PackBitmapIndex bitmapIndex;
 
+	/** Lock for {@link #corruptObjects}. */
+	private final Object corruptObjectsLock = new Object();
+
 	/**
 	 * Objects we have tried to read, and discovered to be corrupt.
 	 * <p>
@@ -155,17 +158,24 @@ private PackIndex idx(DfsReader ctx) throws IOException {
 		Repository.getGlobalListenerList()
 				.dispatch(new BeforeDfsPackIndexLoadedEvent(this));
 
-		synchronized (initLock) {
+		synchronized (indexLock) {
 			if (index != null) {
 				return index;
 			}
 
 			try {
 				DfsStreamKey idxKey = desc.getStreamKey(INDEX);
+				AtomicBoolean cacheHit = new AtomicBoolean(true);
 				DfsBlockCache.Ref<PackIndex> idxref = cache.getOrLoadRef(
 						idxKey,
 						REF_POSITION,
-						() -> loadPackIndex(ctx, idxKey));
+						() -> {
+							cacheHit.set(false);
+							return loadPackIndex(ctx, idxKey);
+						});
+				if (cacheHit.get()) {
+					ctx.stats.idxCacheHit++;
+				}
 				PackIndex idx = idxref.get();
 				if (index == null && idx != null) {
 					index = idx;
@@ -183,7 +193,17 @@ final boolean isGarbage() {
 		return desc.getPackSource() == UNREACHABLE_GARBAGE;
 	}
 
-	PackBitmapIndex getBitmapIndex(DfsReader ctx) throws IOException {
+	/**
+	 * Get the BitmapIndex for this PackFile.
+	 *
+	 * @param ctx
+	 *            reader context to support reading from the backing store if
+	 *            the index is not already loaded in memory.
+	 * @return the BitmapIndex.
+	 * @throws java.io.IOException
+	 *             the bitmap index is not available, or is corrupt.
+	 */
+	public PackBitmapIndex getBitmapIndex(DfsReader ctx) throws IOException {
 		if (invalid || isGarbage() || !desc.hasFileExt(BITMAP_INDEX)) {
 			return null;
 		}
@@ -192,18 +212,23 @@ PackBitmapIndex getBitmapIndex(DfsReader ctx) throws IOException {
 			return bitmapIndex;
 		}
 
-		synchronized (initLock) {
+		synchronized (bitmapIndexLock) {
 			if (bitmapIndex != null) {
 				return bitmapIndex;
 			}
 
-			PackIndex idx = idx(ctx);
-			PackReverseIndex revidx = getReverseIdx(ctx);
 			DfsStreamKey bitmapKey = desc.getStreamKey(BITMAP_INDEX);
+			AtomicBoolean cacheHit = new AtomicBoolean(true);
 			DfsBlockCache.Ref<PackBitmapIndex> idxref = cache.getOrLoadRef(
 					bitmapKey,
 					REF_POSITION,
-					() -> loadBitmapIndex(ctx, bitmapKey, idx, revidx));
+					() -> {
+						cacheHit.set(false);
+						return loadBitmapIndex(ctx, bitmapKey);
+					});
+			if (cacheHit.get()) {
+				ctx.stats.bitmapCacheHit++;
+			}
 			PackBitmapIndex bmidx = idxref.get();
 			if (bitmapIndex == null && bmidx != null) {
 				bitmapIndex = bmidx;
@@ -217,7 +242,7 @@ PackReverseIndex getReverseIdx(DfsReader ctx) throws IOException {
 			return reverseIndex;
 		}
 
-		synchronized (initLock) {
+		synchronized (indexLock) {
 			if (reverseIndex != null) {
 				return reverseIndex;
 			}
@@ -225,10 +250,17 @@ PackReverseIndex getReverseIdx(DfsReader ctx) throws IOException {
 			PackIndex idx = idx(ctx);
 			DfsStreamKey revKey = new DfsStreamKey.ForReverseIndex(
 					desc.getStreamKey(INDEX));
+			AtomicBoolean cacheHit = new AtomicBoolean(true);
 			DfsBlockCache.Ref<PackReverseIndex> revref = cache.getOrLoadRef(
 					revKey,
 					REF_POSITION,
-					() -> loadReverseIdx(revKey, idx));
+					() -> {
+						cacheHit.set(false);
+						return loadReverseIdx(ctx, revKey, idx);
+					});
+			if (cacheHit.get()) {
+				ctx.stats.ridxCacheHit++;
+			}
 			PackReverseIndex revidx = revref.get();
 			if (reverseIndex == null && revidx != null) {
 				reverseIndex = revidx;
@@ -981,7 +1013,7 @@ boolean isCorrupt(long offset) {
 	private void setCorrupt(long offset) {
 		LongList list = corruptObjects;
 		if (list == null) {
-			synchronized (initLock) {
+			synchronized (corruptObjectsLock) {
 				list = corruptObjects;
 				if (list == null) {
 					list = new LongList();
@@ -1031,9 +1063,12 @@ private DfsBlockCache.Ref<PackIndex> loadPackIndex(
 	}
 
 	private DfsBlockCache.Ref<PackReverseIndex> loadReverseIdx(
-			DfsStreamKey revKey, PackIndex idx) {
+			DfsReader ctx, DfsStreamKey revKey, PackIndex idx) {
+		ctx.stats.readReverseIdx++;
+		long start = System.nanoTime();
 		PackReverseIndex revidx = new PackReverseIndex(idx);
 		reverseIndex = revidx;
+		ctx.stats.readReverseIdxMicros += elapsedMicros(start);
 		return new DfsBlockCache.Ref<>(
 				revKey,
 				REF_POSITION,
@@ -1041,11 +1076,8 @@ private DfsBlockCache.Ref<PackReverseIndex> loadReverseIdx(
 				revidx);
 	}
 
-	private DfsBlockCache.Ref<PackBitmapIndex> loadBitmapIndex(
-			DfsReader ctx,
-			DfsStreamKey bitmapKey,
-			PackIndex idx,
-			PackReverseIndex revidx) throws IOException {
+	private DfsBlockCache.Ref<PackBitmapIndex> loadBitmapIndex(DfsReader ctx,
+			DfsStreamKey bitmapKey) throws IOException {
 		ctx.stats.readBitmap++;
 		long start = System.nanoTime();
 		try (ReadableChannel rc = ctx.db.openFile(desc, BITMAP_INDEX)) {
@@ -1061,11 +1093,12 @@ private DfsBlockCache.Ref<PackBitmapIndex> loadBitmapIndex(
 					bs = wantSize;
 				}
 				in = new BufferedInputStream(in, bs);
-				bmidx = PackBitmapIndex.read(in, idx, revidx);
+				bmidx = PackBitmapIndex.read(in, () -> idx(ctx),
+						() -> getReverseIdx(ctx));
 			} finally {
 				size = rc.position();
-				ctx.stats.readIdxBytes += size;
-				ctx.stats.readIdxMicros += elapsedMicros(start);
+				ctx.stats.readBitmapIdxBytes += size;
+				ctx.stats.readBitmapIdxMicros += elapsedMicros(start);
 			}
 			bitmapIndex = bmidx;
 			return new DfsBlockCache.Ref<>(
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderIoStats.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderIoStats.java
index b7a7196..5c47425 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderIoStats.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderIoStats.java
@@ -19,18 +19,39 @@ public static class Accumulator {
 		/** Number of times the reader explicitly called scanPacks. */
 		long scanPacks;
 
+		/** Total number of cache hits for pack indexes. */
+		long idxCacheHit;
+
+		/** Total number of cache hits for reverse indexes. */
+		long ridxCacheHit;
+
+		/** Total number of cache hits for bitmap indexes. */
+		long bitmapCacheHit;
+
 		/** Total number of complete pack indexes read into memory. */
 		long readIdx;
 
 		/** Total number of complete bitmap indexes read into memory. */
 		long readBitmap;
 
-		/** Total number of bytes read from indexes. */
+		/** Total number of reverse indexes added into memory. */
+		long readReverseIdx;
+
+		/** Total number of bytes read from pack indexes. */
 		long readIdxBytes;
 
-		/** Total microseconds spent reading pack or bitmap indexes. */
+		/** Total microseconds spent reading pack indexes. */
 		long readIdxMicros;
 
+		/** Total microseconds spent creating reverse indexes. */
+		long readReverseIdxMicros;
+
+		/** Total number of bytes read from bitmap indexes. */
+		long readBitmapIdxBytes;
+
+		/** Total microseconds spent reading bitmap indexes. */
+		long readBitmapIdxMicros;
+
 		/** Total number of block cache hits. */
 		long blockCacheHit;
 
@@ -75,6 +96,33 @@ public long getScanPacks() {
 	}
 
 	/**
+	 * Get total number of pack index cache hits.
+	 *
+	 * @return total number of pack index cache hits.
+	 */
+	public long getPackIndexCacheHits() {
+		return stats.idxCacheHit;
+	}
+
+	/**
+	 * Get total number of reverse index cache hits.
+	 *
+	 * @return total number of reverse index cache hits.
+	 */
+	public long getReverseIndexCacheHits() {
+		return stats.ridxCacheHit;
+	}
+
+	/**
+	 * Get total number of bitmap index cache hits.
+	 *
+	 * @return total number of bitmap index cache hits.
+	 */
+	public long getBitmapIndexCacheHits() {
+		return stats.bitmapCacheHit;
+	}
+
+	/**
 	 * Get total number of complete pack indexes read into memory.
 	 *
 	 * @return total number of complete pack indexes read into memory.
@@ -84,6 +132,15 @@ public long getReadPackIndexCount() {
 	}
 
 	/**
+	 * Get total number of times the reverse index was computed.
+	 *
+	 * @return total number of reverse index was computed.
+	 */
+	public long getReadReverseIndexCount() {
+		return stats.readReverseIdx;
+	}
+
+	/**
 	 * Get total number of complete bitmap indexes read into memory.
 	 *
 	 * @return total number of complete bitmap indexes read into memory.
@@ -93,24 +150,51 @@ public long getReadBitmapIndexCount() {
 	}
 
 	/**
-	 * Get total number of bytes read from indexes.
+	 * Get total number of bytes read from pack indexes.
 	 *
-	 * @return total number of bytes read from indexes.
+	 * @return total number of bytes read from pack indexes.
 	 */
 	public long getReadIndexBytes() {
 		return stats.readIdxBytes;
 	}
 
 	/**
-	 * Get total microseconds spent reading pack or bitmap indexes.
+	 * Get total microseconds spent reading pack indexes.
 	 *
-	 * @return total microseconds spent reading pack or bitmap indexes.
+	 * @return total microseconds spent reading pack indexes.
 	 */
 	public long getReadIndexMicros() {
 		return stats.readIdxMicros;
 	}
 
 	/**
+	 * Get total microseconds spent creating reverse indexes.
+	 *
+	 * @return total microseconds spent creating reverse indexes.
+	 */
+	public long getReadReverseIndexMicros() {
+		return stats.readReverseIdxMicros;
+	}
+
+	/**
+	 * Get total number of bytes read from bitmap indexes.
+	 *
+	 * @return total number of bytes read from bitmap indexes.
+	 */
+	public long getReadBitmapIndexBytes() {
+		return stats.readBitmapIdxBytes;
+	}
+
+	/**
+	 * Get total microseconds spent reading bitmap indexes.
+	 *
+	 * @return total microseconds spent reading bitmap indexes.
+	 */
+	public long getReadBitmapIndexMicros() {
+		return stats.readBitmapIdxMicros;
+	}
+
+	/**
 	 * Get total number of block cache hits.
 	 *
 	 * @return total number of block cache hits.
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndex.java
index beb51dc..b7439f9 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndex.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndex.java
@@ -97,7 +97,37 @@ public static PackBitmapIndex open(
 	public static PackBitmapIndex read(
 			InputStream fd, PackIndex packIndex, PackReverseIndex reverseIndex)
 			throws IOException {
-		return new PackBitmapIndexV1(fd, packIndex, reverseIndex);
+		return new PackBitmapIndexV1(fd, () -> packIndex, () -> reverseIndex);
+	}
+
+	/**
+	 * Read an existing pack bitmap index file from a buffered stream.
+	 * <p>
+	 * The format of the file will be automatically detected and a proper access
+	 * implementation for that format will be constructed and returned to the
+	 * caller. The file may or may not be held open by the returned instance.
+	 *
+	 * @param fd
+	 *            stream to read the bitmap index file from. The stream must be
+	 *            buffered as some small IOs are performed against the stream.
+	 *            The caller is responsible for closing the stream.
+	 * @param packIndexSupplier
+	 *            the supplier for pack index for the corresponding pack file.
+	 * @param reverseIndexSupplier
+	 *            the supplier for pack reverse index for the corresponding pack
+	 *            file.
+	 * @return a copy of the index in-memory.
+	 * @throws java.io.IOException
+	 *             the stream cannot be read.
+	 * @throws CorruptObjectException
+	 *             the stream does not contain a valid pack bitmap index.
+	 */
+	public static PackBitmapIndex read(InputStream fd,
+			SupplierWithIOException<PackIndex> packIndexSupplier,
+			SupplierWithIOException<PackReverseIndex> reverseIndexSupplier)
+			throws IOException {
+		return new PackBitmapIndexV1(fd, packIndexSupplier,
+				reverseIndexSupplier);
 	}
 
 	/** Footer checksum applied on the bottom of the pack file. */
@@ -161,4 +191,19 @@ public abstract EWAHCompressedBitmap ofObjectType(
 	 * @return the number of bitmaps in this bitmap index.
 	 */
 	public abstract int getBitmapCount();
+
+	/**
+	 * Supplier that propagates IOException.
+	 *
+	 * @param <T>
+	 *            the return type which is expected from {@link #get()}
+	 */
+	@FunctionalInterface
+	public interface SupplierWithIOException<T> {
+		/**
+		 * @return result
+		 * @throws IOException
+		 */
+		T get() throws IOException;
+	}
 }
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexV1.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexV1.java
index b7d241f..c7864f4 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexV1.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexV1.java
@@ -14,8 +14,11 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.text.MessageFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
+import org.eclipse.jgit.annotations.Nullable;
 import org.eclipse.jgit.internal.JGitText;
 import org.eclipse.jgit.lib.AnyObjectId;
 import org.eclipse.jgit.lib.Constants;
@@ -46,11 +49,13 @@ class PackBitmapIndexV1 extends BasePackBitmapIndex {
 
 	private final ObjectIdOwnerMap<StoredBitmap> bitmaps;
 
-	PackBitmapIndexV1(final InputStream fd, PackIndex packIndex,
-			PackReverseIndex reverseIndex) throws IOException {
+	PackBitmapIndexV1(final InputStream fd,
+			SupplierWithIOException<PackIndex> packIndexSupplier,
+			SupplierWithIOException<PackReverseIndex> reverseIndexSupplier)
+			throws IOException {
+		// An entry is object id, xor offset, flag byte, and a length encoded
+		// bitmap. The object id is an int32 of the nth position sorted by name.
 		super(new ObjectIdOwnerMap<StoredBitmap>());
-		this.packIndex = packIndex;
-		this.reverseIndex = reverseIndex;
 		this.bitmaps = getBitmaps();
 
 		final byte[] scratch = new byte[32];
@@ -97,10 +102,10 @@ class PackBitmapIndexV1 extends BasePackBitmapIndex {
 		this.blobs = readBitmap(dataInput);
 		this.tags = readBitmap(dataInput);
 
-		// An entry is object id, xor offset, flag byte, and a length encoded
-		// bitmap. The object id is an int32 of the nth position sorted by name.
+		// Read full bitmap from storage first.
+		List<IdxPositionBitmap> idxPositionBitmapList = new ArrayList<>();
 		// The xor offset is a single byte offset back in the list of entries.
-		StoredBitmap[] recentBitmaps = new StoredBitmap[MAX_XOR_OFFSET];
+		IdxPositionBitmap[] recentBitmaps = new IdxPositionBitmap[MAX_XOR_OFFSET];
 		for (int i = 0; i < (int) numEntries; i++) {
 			IO.readFully(fd, scratch, 0, 6);
 			int nthObjectId = NB.decodeInt32(scratch, 0);
@@ -108,38 +113,58 @@ class PackBitmapIndexV1 extends BasePackBitmapIndex {
 			int flags = scratch[5];
 			EWAHCompressedBitmap bitmap = readBitmap(dataInput);
 
-			if (nthObjectId < 0)
+			if (nthObjectId < 0) {
 				throw new IOException(MessageFormat.format(
 						JGitText.get().invalidId, String.valueOf(nthObjectId)));
-			if (xorOffset < 0)
+			}
+			if (xorOffset < 0) {
 				throw new IOException(MessageFormat.format(
 						JGitText.get().invalidId, String.valueOf(xorOffset)));
-			if (xorOffset > MAX_XOR_OFFSET)
+			}
+			if (xorOffset > MAX_XOR_OFFSET) {
 				throw new IOException(MessageFormat.format(
 						JGitText.get().expectedLessThanGot,
 						String.valueOf(MAX_XOR_OFFSET),
 						String.valueOf(xorOffset)));
-			if (xorOffset > i)
+			}
+			if (xorOffset > i) {
 				throw new IOException(MessageFormat.format(
 						JGitText.get().expectedLessThanGot, String.valueOf(i),
 						String.valueOf(xorOffset)));
-
-			ObjectId objectId = packIndex.getObjectId(nthObjectId);
-			StoredBitmap xorBitmap = null;
+			}
+			IdxPositionBitmap xorIdxPositionBitmap = null;
 			if (xorOffset > 0) {
 				int index = (i - xorOffset);
-				xorBitmap = recentBitmaps[index % recentBitmaps.length];
-				if (xorBitmap == null)
+				xorIdxPositionBitmap = recentBitmaps[index
+						% recentBitmaps.length];
+				if (xorIdxPositionBitmap == null) {
 					throw new IOException(MessageFormat.format(
 							JGitText.get().invalidId,
 							String.valueOf(xorOffset)));
+				}
 			}
-
-			StoredBitmap sb = new StoredBitmap(
-					objectId, bitmap, xorBitmap, flags);
-			bitmaps.add(sb);
-			recentBitmaps[i % recentBitmaps.length] = sb;
+			IdxPositionBitmap idxPositionBitmap = new IdxPositionBitmap(
+					nthObjectId, xorIdxPositionBitmap, bitmap, flags);
+			idxPositionBitmapList.add(idxPositionBitmap);
+			recentBitmaps[i % recentBitmaps.length] = idxPositionBitmap;
 		}
+
+		this.packIndex = packIndexSupplier.get();
+		for (int i = 0; i < idxPositionBitmapList.size(); ++i) {
+			IdxPositionBitmap idxPositionBitmap = idxPositionBitmapList.get(i);
+			ObjectId objectId = packIndex
+					.getObjectId(idxPositionBitmap.nthObjectId);
+			StoredBitmap sb = new StoredBitmap(objectId,
+					idxPositionBitmap.bitmap,
+					idxPositionBitmap.getXorStoredBitmap(),
+					idxPositionBitmap.flags);
+			// Save the StoredBitmap for a possible future XorStoredBitmap
+			// reference.
+			idxPositionBitmap.sb = sb;
+			bitmaps.add(sb);
+		}
+
+		this.reverseIndex = reverseIndexSupplier.get();
 	}
 
 	/** {@inheritDoc} */
@@ -214,4 +239,30 @@ private static EWAHCompressedBitmap readBitmap(DataInput dataInput)
 		bitmap.deserialize(dataInput);
 		return bitmap;
 	}
+
+	/**
+	 * Temporary holder of object position in pack index and other metadata for
+	 * {@code StoredBitmap}.
+	 */
+	private static final class IdxPositionBitmap {
+		int nthObjectId;
+		IdxPositionBitmap xorIdxPositionBitmap;
+		EWAHCompressedBitmap bitmap;
+		int flags;
+		StoredBitmap sb;
+
+		IdxPositionBitmap(int nthObjectId, @Nullable
+		IdxPositionBitmap xorIdxPositionBitmap, EWAHCompressedBitmap bitmap,
+				int flags) {
+			this.nthObjectId = nthObjectId;
+			this.xorIdxPositionBitmap = xorIdxPositionBitmap;
+			this.bitmap = bitmap;
+			this.flags = flags;
+		}
+
+		StoredBitmap getXorStoredBitmap() {
+			return xorIdxPositionBitmap == null ? null
+					: xorIdxPositionBitmap.sb;
+		}
+	}
 }
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java
index 73745d8..f32909f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java
@@ -33,6 +33,7 @@
 import org.eclipse.jgit.errors.CorruptObjectException;
 import org.eclipse.jgit.errors.PackInvalidException;
 import org.eclipse.jgit.errors.PackMismatchException;
+import org.eclipse.jgit.errors.SearchForReuseTimeout;
 import org.eclipse.jgit.internal.JGitText;
 import org.eclipse.jgit.internal.storage.pack.ObjectToPack;
 import org.eclipse.jgit.internal.storage.pack.PackExt;
@@ -264,7 +265,10 @@ void selectRepresentation(PackWriter packer, ObjectToPack otp,
 					p.resetTransientErrorCount();
 					if (rep != null) {
 						packer.select(otp, rep);
+						packer.checkSearchForReuseTimeout();
 					}
+				} catch (SearchForReuseTimeout e) {
+					break SEARCH;
 				} catch (PackMismatchException e) {
 					// Pack was modified; refresh the entire pack list.
 					//
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java
index 3e4b5df..61f92d2 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java
@@ -25,6 +25,7 @@
 import java.lang.ref.WeakReference;
 import java.security.MessageDigest;
 import java.text.MessageFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -54,6 +55,7 @@
 import org.eclipse.jgit.errors.IncorrectObjectTypeException;
 import org.eclipse.jgit.errors.LargeObjectException;
 import org.eclipse.jgit.errors.MissingObjectException;
+import org.eclipse.jgit.errors.SearchForReuseTimeout;
 import org.eclipse.jgit.errors.StoredObjectRepresentationNotAvailableException;
 import org.eclipse.jgit.internal.JGitText;
 import org.eclipse.jgit.internal.storage.file.PackBitmapIndexBuilder;
@@ -262,6 +264,12 @@ public static Iterable<PackWriter> getInstances() {
 
 	private boolean indexDisabled;
 
+	private boolean checkSearchForReuseTimeout = false;
+
+	private final Duration searchForReuseTimeout;
+
+	private long searchForReuseStartTimeEpoc;
+
 	private int depth;
 
 	private Collection<? extends ObjectId> unshallowObjects;
@@ -356,6 +364,7 @@ public PackWriter(PackConfig config, final ObjectReader reader,
 
 		deltaBaseAsOffset = config.isDeltaBaseAsOffset();
 		reuseDeltas = config.isReuseDeltas();
+		searchForReuseTimeout = config.getSearchForReuseTimeout();
 		reuseValidate = true; // be paranoid by default
 		stats = statsAccumulator != null ? statsAccumulator
 				: new PackStatistics.Accumulator();
@@ -405,6 +414,24 @@ public boolean isDeltaBaseAsOffset() {
 	}
 
 	/**
+	 * Check whether the search for reuse phase is taking too long. This could
+	 * be the case when the number of objects and pack files is high and the
+	 * system is under pressure. If that's the case and
+	 * checkSearchForReuseTimeout is true abort the search.
+	 *
+	 * @throws SearchForReuseTimeout
+	 *             if the search for reuse is taking too long.
+	 */
+	public void checkSearchForReuseTimeout() throws SearchForReuseTimeout {
+		if (checkSearchForReuseTimeout
+				&& Duration.ofMillis(System.currentTimeMillis()
+						- searchForReuseStartTimeEpoc)
+				.compareTo(searchForReuseTimeout) > 0) {
+			throw new SearchForReuseTimeout(searchForReuseTimeout);
+		}
+	}
+
+	/**
 	 * Set writer delta base format. Delta base can be written as an offset in a
 	 * pack file (new approach reducing file size) or as an object id (legacy
 	 * approach, compatible with old readers).
@@ -420,6 +447,22 @@ public void setDeltaBaseAsOffset(boolean deltaBaseAsOffset) {
 	}
 
 	/**
+	 * Set the writer to check for long search for reuse, exceeding the timeout.
+	 * Selecting an object representation can be an expensive operation. It is
+	 * possible to set a max search for reuse time (see
+	 * PackConfig#CONFIG_KEY_SEARCH_FOR_REUSE_TIMEOUT for more details).
+	 *
+	 * However some operations, i.e.: GC, need to find the best candidate
+	 * regardless how much time the operation will need to finish.
+	 *
+	 * This method enables the search for reuse timeout check, otherwise
+	 * disabled.
+	 */
+	public void enableSearchForReuseTimeout() {
+		this.checkSearchForReuseTimeout = true;
+	}
+
+	/**
 	 * Check if the writer will reuse commits that are already stored as deltas.
 	 *
 	 * @return true if the writer would reuse commits stored as deltas, assuming
@@ -1306,6 +1349,7 @@ private void searchForReuse(ProgressMonitor monitor) throws IOException {
 		cnt += objectsLists[OBJ_TAG].size();
 
 		long start = System.currentTimeMillis();
+		searchForReuseStartTimeEpoc = start;
 		beginPhase(PackingPhase.FINDING_SOURCES, monitor, cnt);
 		if (cnt <= 4096) {
 			// For small object counts, do everything as one list.
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/ssh/OpenSshConfigFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/ssh/OpenSshConfigFile.java
index 6fbb4c5..228c25f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/ssh/OpenSshConfigFile.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/ssh/OpenSshConfigFile.java
@@ -482,12 +482,18 @@ public static class HostEntry implements SshConfigStore.HostConfig {
 
 		private final List<String> patterns;
 
-		// Constructor used to build the merged entry; never matches anything
-		HostEntry() {
+		/**
+		 * Constructor used to build the merged entry; never matches anything
+		 */
+		public HostEntry() {
 			this.patterns = Collections.emptyList();
 		}
 
-		HostEntry(List<String> patterns) {
+		/**
+		 * @param patterns
+		 *            to be used in matching against host name.
+		 */
+		public HostEntry(List<String> patterns) {
 			this.patterns = patterns;
 		}
 
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitConfig.java
new file mode 100644
index 0000000..e4e7cd6
--- /dev/null
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitConfig.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2020 Julian Ruppel <julian.ruppel@sap.com>
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Distribution License v. 1.0 which is available at
+ * https://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+package org.eclipse.jgit.lib;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.charset.IllegalCharsetNameException;
+import java.nio.charset.StandardCharsets;
+import java.nio.charset.UnsupportedCharsetException;
+import java.text.MessageFormat;
+import org.eclipse.jgit.annotations.Nullable;
+import org.eclipse.jgit.errors.ConfigInvalidException;
+import org.eclipse.jgit.internal.JGitText;
+import org.eclipse.jgit.lib.Config.SectionParser;
+import org.eclipse.jgit.util.FS;
+import org.eclipse.jgit.util.IO;
+import org.eclipse.jgit.util.RawParseUtils;
+
+/**
+ * The standard "commit" configuration parameters.
+ *
+ * @since 5.13
+ */
+public class CommitConfig {
+	/**
+	 * Key for {@link Config#get(SectionParser)}.
+	 */
+	public static final Config.SectionParser<CommitConfig> KEY = CommitConfig::new;
+
+	private final static Charset DEFAULT_COMMIT_MESSAGE_ENCODING = StandardCharsets.UTF_8;
+
+	private String i18nCommitEncoding;
+
+	private String commitTemplatePath;
+
+	private CommitConfig(Config rc) {
+		commitTemplatePath = rc.getString(ConfigConstants.CONFIG_COMMIT_SECTION,
+				null, ConfigConstants.CONFIG_KEY_COMMIT_TEMPLATE);
+		i18nCommitEncoding = rc.getString(ConfigConstants.CONFIG_SECTION_I18N,
+				null, ConfigConstants.CONFIG_KEY_COMMIT_ENCODING);
+	}
+
+	/**
+	 * Get the path to the commit template as defined in the git
+	 * {@code commit.template} property.
+	 *
+	 * @return the path to commit template or {@code null} if not present.
+	 */
+	@Nullable
+	public String getCommitTemplatePath() {
+		return commitTemplatePath;
+	}
+
+	/**
+	 * Get the encoding of the commit as defined in the git
+	 * {@code i18n.commitEncoding} property.
+	 *
+	 * @return the encoding or {@code null} if not present.
+	 */
+	@Nullable
+	public String getCommitEncoding() {
+		return i18nCommitEncoding;
+	}
+
+	/**
+	 * Get the content to the commit template as defined in
+	 * {@code commit.template}. If no {@code i18n.commitEncoding} is specified,
+	 * UTF-8 fallback is used.
+	 *
+	 * @return content of the commit template or {@code null} if not present.
+	 * @throws IOException
+	 *             if the template file can not be read
+	 * @throws FileNotFoundException
+	 *             if the template file does not exists
+	 * @throws ConfigInvalidException
+	 *             if a {@code commitEncoding} is specified and is invalid
+	 */
+	@Nullable
+	public String getCommitTemplateContent()
+			throws FileNotFoundException, IOException, ConfigInvalidException {
+
+		if (commitTemplatePath == null) {
+			return null;
+		}
+
+		File commitTemplateFile;
+		if (commitTemplatePath.startsWith("~/")) { //$NON-NLS-1$
+			commitTemplateFile = FS.DETECTED.resolve(FS.DETECTED.userHome(),
+					commitTemplatePath.substring(2));
+		} else {
+			commitTemplateFile = FS.DETECTED.resolve(null, commitTemplatePath);
+		}
+
+		Charset commitMessageEncoding = getEncoding();
+		return RawParseUtils.decode(commitMessageEncoding,
+				IO.readFully(commitTemplateFile));
+
+	}
+
+	private Charset getEncoding() throws ConfigInvalidException {
+		Charset commitMessageEncoding = DEFAULT_COMMIT_MESSAGE_ENCODING;
+
+		if (i18nCommitEncoding == null) {
+			return null;
+		}
+
+		try {
+			commitMessageEncoding = Charset.forName(i18nCommitEncoding);
+		} catch (IllegalCharsetNameException | UnsupportedCharsetException e) {
+			throw new ConfigInvalidException(MessageFormat.format(
+					JGitText.get().invalidEncoding, i18nCommitEncoding), e);
+		}
+
+		return commitMessageEncoding;
+	}
+}
\ No newline at end of file
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
index 3e3d9b5..24eebc6 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
@@ -125,6 +125,13 @@ public final class ConfigConstants {
 	public static final String CONFIG_COMMIT_SECTION = "commit";
 
 	/**
+	 * The "template" key
+	 *
+	 * @since 5.13
+	 */
+	public static final String CONFIG_KEY_COMMIT_TEMPLATE = "template";
+
+	/**
 	 * The "tag" section
 	 *
 	 * @since 5.11
@@ -518,6 +525,13 @@ public final class ConfigConstants {
 	public static final String CONFIG_SECTION_I18N = "i18n";
 
 	/**
+	 * The "commitEncoding" key
+	 *
+	 * @since 5.13
+	 */
+	public static final String CONFIG_KEY_COMMIT_ENCODING = "commitEncoding";
+
+	/**
 	 * The "logOutputEncoding" key
 	 *
 	 * @since 5.2
@@ -736,4 +750,12 @@ public final class ConfigConstants {
 	 * @since 5.11
 	 */
 	public static final String CONFIG_KEY_DEFAULT_BRANCH = "defaultbranch";
+
+	/**
+	 * The "pack.searchForReuseTimeout" key
+	 *
+	 * @since 5.13
+	 */
+	public static final String CONFIG_KEY_SEARCH_FOR_REUSE_TIMEOUT = "searchforreusetimeout";
+
 }
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java
index f76dd27..6aa8be6 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java
@@ -29,6 +29,7 @@
 import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_MIN_SIZE_PREVENT_RACYPACK;
 import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_REUSE_DELTAS;
 import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_REUSE_OBJECTS;
+import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_SEARCH_FOR_REUSE_TIMEOUT;
 import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_SINGLE_PACK;
 import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_THREADS;
 import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_WAIT_PREVENT_RACYPACK;
@@ -36,7 +37,9 @@
 import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_WINDOW_MEMORY;
 import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_PACK_SECTION;
 
+import java.time.Duration;
 import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
 import java.util.zip.Deflater;
 
 import org.eclipse.jgit.internal.storage.file.PackIndexWriter;
@@ -222,6 +225,16 @@ public class PackConfig {
 	 */
 	public static final int DEFAULT_BITMAP_INACTIVE_BRANCH_AGE_IN_DAYS = 90;
 
+	/**
+	 * Default max time to spend during the search for reuse phase. This
+	 * optimization is disabled by default: {@value}
+	 *
+	 * @see #setSearchForReuseTimeout(Duration)
+	 * @since 5.13
+	 */
+	public static final Duration DEFAULT_SEARCH_FOR_REUSE_TIMEOUT = Duration
+			.ofSeconds(Integer.MAX_VALUE);
+
 	private int compressionLevel = Deflater.DEFAULT_COMPRESSION;
 
 	private boolean reuseDeltas = DEFAULT_REUSE_DELTAS;
@@ -272,6 +285,8 @@ public class PackConfig {
 
 	private int bitmapInactiveBranchAgeInDays = DEFAULT_BITMAP_INACTIVE_BRANCH_AGE_IN_DAYS;
 
+	private Duration searchForReuseTimeout = DEFAULT_SEARCH_FOR_REUSE_TIMEOUT;
+
 	private boolean cutDeltaChains;
 
 	private boolean singlePack;
@@ -342,6 +357,7 @@ public PackConfig(PackConfig cfg) {
 		this.bitmapInactiveBranchAgeInDays = cfg.bitmapInactiveBranchAgeInDays;
 		this.cutDeltaChains = cfg.cutDeltaChains;
 		this.singlePack = cfg.singlePack;
+		this.searchForReuseTimeout = cfg.searchForReuseTimeout;
 	}
 
 	/**
@@ -1104,6 +1120,18 @@ public int getBitmapInactiveBranchAgeInDays() {
 	}
 
 	/**
+	 * Get the max time to spend during the search for reuse phase.
+	 *
+	 * Default setting: {@value #DEFAULT_SEARCH_FOR_REUSE_TIMEOUT}
+	 *
+	 * @return the maximum time to spend during the search for reuse phase.
+	 * @since 5.13
+	 */
+	public Duration getSearchForReuseTimeout() {
+		return searchForReuseTimeout;
+	}
+
+	/**
 	 * Set the age in days that marks a branch as "inactive".
 	 *
 	 * Default setting: {@value #DEFAULT_BITMAP_INACTIVE_BRANCH_AGE_IN_DAYS}
@@ -1117,6 +1145,19 @@ public void setBitmapInactiveBranchAgeInDays(int ageInDays) {
 	}
 
 	/**
+	 * Set the max time to spend during the search for reuse phase.
+	 *
+	 * @param timeout
+	 *            max time allowed during the search for reuse phase
+	 *
+	 *            Default setting: {@value #DEFAULT_SEARCH_FOR_REUSE_TIMEOUT}
+	 * @since 5.13
+	 */
+	public void setSearchForReuseTimeout(Duration timeout) {
+		searchForReuseTimeout = timeout;
+	}
+
+	/**
 	 * Update properties by setting fields from the configuration.
 	 *
 	 * If a property's corresponding variable is not defined in the supplied
@@ -1179,6 +1220,10 @@ public void fromConfig(Config rc) {
 		setBitmapInactiveBranchAgeInDays(rc.getInt(CONFIG_PACK_SECTION,
 				CONFIG_KEY_BITMAP_INACTIVE_BRANCH_AGE_INDAYS,
 				getBitmapInactiveBranchAgeInDays()));
+		setSearchForReuseTimeout(Duration.ofSeconds(rc.getTimeUnit(
+				CONFIG_PACK_SECTION, null,
+				CONFIG_KEY_SEARCH_FOR_REUSE_TIMEOUT,
+				getSearchForReuseTimeout().getSeconds(), TimeUnit.SECONDS)));
 		setWaitPreventRacyPack(rc.getBoolean(CONFIG_PACK_SECTION,
 				CONFIG_KEY_WAIT_PREVENT_RACYPACK, isWaitPreventRacyPack()));
 		setMinSizePreventRacyPack(rc.getLong(CONFIG_PACK_SECTION,
@@ -1216,6 +1261,8 @@ public String toString() {
 				.append(getBitmapExcessiveBranchCount());
 		b.append(", bitmapInactiveBranchAge=") //$NON-NLS-1$
 				.append(getBitmapInactiveBranchAgeInDays());
+		b.append(", searchForReuseTimeout") //$NON-NLS-1$
+				.append(getSearchForReuseTimeout());
 		b.append(", singlePack=").append(getSinglePack()); //$NON-NLS-1$
 		return b.toString();
 	}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchV2Request.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchV2Request.java
index ea63933..50fb9d2 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchV2Request.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchV2Request.java
@@ -36,6 +36,8 @@ public final class FetchV2Request extends FetchRequest {
 
 	private final boolean doneReceived;
 
+	private final boolean waitForDone;
+
 	@NonNull
 	private final List<String> serverOptions;
 
@@ -50,7 +52,8 @@ public final class FetchV2Request extends FetchRequest {
 			@NonNull Set<ObjectId> clientShallowCommits, int deepenSince,
 			@NonNull List<String> deepenNotRefs, int depth,
 			@NonNull FilterSpec filterSpec,
-			boolean doneReceived, @NonNull Set<String> clientCapabilities,
+			boolean doneReceived, boolean waitForDone,
+			@NonNull Set<String> clientCapabilities,
 			@Nullable String agent, @NonNull List<String> serverOptions,
 			boolean sidebandAll, @NonNull List<String> packfileUriProtocols) {
 		super(wantIds, depth, clientShallowCommits, filterSpec,
@@ -59,6 +62,7 @@ public final class FetchV2Request extends FetchRequest {
 		this.peerHas = requireNonNull(peerHas);
 		this.wantedRefs = requireNonNull(wantedRefs);
 		this.doneReceived = doneReceived;
+		this.waitForDone = waitForDone;
 		this.serverOptions = requireNonNull(serverOptions);
 		this.sidebandAll = sidebandAll;
 		this.packfileUriProtocols = packfileUriProtocols;
@@ -90,7 +94,14 @@ boolean wasDoneReceived() {
 	}
 
 	/**
-	 * Options received in server-option lines. The caller can choose to act on
+	 * @return true if the request had a "wait-for-done" line
+	 */
+	boolean wasWaitForDoneReceived() {
+		return waitForDone;
+	}
+
+	/**
+	 * Options received in server-option lines. The caller can choose to	 act on
 	 * these in an application-specific way
 	 *
 	 * @return Immutable list of server options received in the request
@@ -141,6 +152,8 @@ static final class Builder {
 
 		boolean doneReceived;
 
+		boolean waitForDone;
+
 		@Nullable
 		String agent;
 
@@ -280,6 +293,16 @@ Builder setDoneReceived() {
 		}
 
 		/**
+		 * Mark that the "wait-for-done" line has been received.
+		 *
+		 * @return this builder
+		 */
+		Builder setWaitForDone() {
+			waitForDone = true;
+			return this;
+		}
+
+		/**
 		 * Value of an agent line received after the command and before the
 		 * arguments. E.g. "agent=a.b.c/1.0" should set "a.b.c/1.0".
 		 *
@@ -328,7 +351,7 @@ Builder addPackfileUriProtocol(@NonNull String value) {
 		FetchV2Request build() {
 			return new FetchV2Request(peerHas, wantedRefs, wantIds,
 					clientShallowCommits, deepenSince, deepenNotRefs,
-					depth, filterSpec, doneReceived, clientCapabilities,
+					depth, filterSpec, doneReceived, waitForDone, clientCapabilities,
 					agent, Collections.unmodifiableList(serverOptions),
 					sidebandAll,
 					Collections.unmodifiableList(packfileUriProtocols));
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/GitProtocolConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/GitProtocolConstants.java
index 36fce7a..aaa9308 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/GitProtocolConstants.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/GitProtocolConstants.java
@@ -149,6 +149,13 @@ public final class GitProtocolConstants {
 	public static final String OPTION_SIDEBAND_ALL = "sideband-all"; //$NON-NLS-1$
 
 	/**
+	 * The server waits for client to send "done" before sending any packs back.
+	 *
+	 * @since 5.13
+	 */
+	public static final String OPTION_WAIT_FOR_DONE = "wait-for-done"; //$NON-NLS-1$
+
+	/**
 	 * The client supports atomic pushes. If this option is used, the server
 	 * will update all refs within one atomic transaction.
 	 *
@@ -248,6 +255,13 @@ public final class GitProtocolConstants {
 	public static final String COMMAND_FETCH = "fetch"; //$NON-NLS-1$
 
 	/**
+	 * The server supports the object-info capability.
+	 *
+	 * @since 5.13
+	 */
+	public static final String COMMAND_OBJECT_INFO = "object-info"; //$NON-NLS-1$
+
+	/**
 	 * HTTP header to set by clients to request a specific git protocol version
 	 * in the HTTP transport.
 	 *
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ObjectInfoRequest.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ObjectInfoRequest.java
new file mode 100644
index 0000000..86a2716
--- /dev/null
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ObjectInfoRequest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2021, Google LLC. and others
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Distribution License v. 1.0 which is available at
+ * https://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+package org.eclipse.jgit.transport;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.jgit.lib.ObjectId;
+
+/**
+ * object-info request.
+ *
+ * <p>
+ * This is the parsed request for an object-info call, used as input to
+ * {@link ProtocolV2Hook}.
+ *
+ * @see <a href=
+ *      "https://www.kernel.org/pub/software/scm/git/docs/technical/protocol-v2.html#_object_info">object-info
+ *      documentation</a>
+ *
+ * @since 5.13
+ */
+public final class ObjectInfoRequest {
+	private final List<ObjectId> objectIDs;
+
+	private ObjectInfoRequest(List<ObjectId> objectIDs) {
+		this.objectIDs = objectIDs;
+	}
+
+	/** @return object IDs that the client requested. */
+	public List<ObjectId> getObjectIDs() {
+		return this.objectIDs;
+	}
+
+	/** @return A builder of {@link ObjectInfoRequest}. */
+	public static Builder builder() {
+		return new Builder();
+	}
+
+	/** A builder for {@link ObjectInfoRequest}. */
+	public static final class Builder {
+		private List<ObjectId> objectIDs = Collections.emptyList();
+
+		private Builder() {
+		}
+
+		/**
+		 * @param value
+		 * @return the Builder
+		 */
+		public Builder setObjectIDs(List<ObjectId> value) {
+			objectIDs = value;
+			return this;
+		}
+
+		/** @return ObjectInfoRequest */
+		public ObjectInfoRequest build() {
+			return new ObjectInfoRequest(
+					Collections.unmodifiableList(objectIDs));
+		}
+	}
+}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ProtocolV2Hook.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ProtocolV2Hook.java
index bfa7490..d7626df 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ProtocolV2Hook.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ProtocolV2Hook.java
@@ -55,4 +55,16 @@ default void onFetch(FetchV2Request req)
 			throws ServiceMayNotContinueException {
 		// Do nothing by default
 	}
+
+	/**
+	 * @param req
+	 *            the object-info request
+	 * @throws ServiceMayNotContinueException
+	 *             abort; the message will be sent to the user
+	 * @since 5.13
+	 */
+	default void onObjectInfo(ObjectInfoRequest req)
+			throws ServiceMayNotContinueException {
+		// Do nothing by default
+	}
 }
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ProtocolV2HookChain.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ProtocolV2HookChain.java
index 4cf8db6..7b3a4ce 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ProtocolV2HookChain.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ProtocolV2HookChain.java
@@ -71,6 +71,14 @@ public void onFetch(FetchV2Request req)
 		}
 	}
 
+	@Override
+	public void onObjectInfo(ObjectInfoRequest req)
+			throws ServiceMayNotContinueException {
+		for (ProtocolV2Hook hook : hooks) {
+			hook.onObjectInfo(req);
+		}
+	}
+
 	private ProtocolV2HookChain(List<? extends ProtocolV2Hook> hooks) {
 		this.hooks = Collections.unmodifiableList(hooks);
 	}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ProtocolV2Parser.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ProtocolV2Parser.java
index faccc25..6cec4b9 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ProtocolV2Parser.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ProtocolV2Parser.java
@@ -19,6 +19,7 @@
 import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SIDEBAND_ALL;
 import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SIDE_BAND_64K;
 import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_THIN_PACK;
+import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_WAIT_FOR_DONE;
 import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_WANT_REF;
 
 import java.io.IOException;
@@ -27,6 +28,7 @@
 import java.util.List;
 import java.util.function.Consumer;
 
+import org.eclipse.jgit.errors.InvalidObjectIdException;
 import org.eclipse.jgit.errors.PackProtocolException;
 import org.eclipse.jgit.internal.JGitText;
 import org.eclipse.jgit.lib.ObjectId;
@@ -123,6 +125,8 @@ FetchV2Request parseFetchRequest(PacketLineIn pckIn)
 				reqBuilder.addPeerHas(ObjectId.fromString(line2.substring(5)));
 			} else if (line2.equals("done")) { //$NON-NLS-1$
 				reqBuilder.setDoneReceived();
+			} else if (line2.equals(OPTION_WAIT_FOR_DONE)) {
+				reqBuilder.setWaitForDone();
 			} else if (line2.equals(OPTION_THIN_PACK)) {
 				reqBuilder.addClientCapability(OPTION_THIN_PACK);
 			} else if (line2.equals(OPTION_NO_PROGRESS)) {
@@ -245,4 +249,38 @@ LsRefsV2Request parseLsRefsRequest(PacketLineIn pckIn)
 		return builder.setRefPrefixes(prefixes).build();
 	}
 
+	ObjectInfoRequest parseObjectInfoRequest(PacketLineIn pckIn)
+			throws PackProtocolException, IOException {
+		ObjectInfoRequest.Builder builder = ObjectInfoRequest.builder();
+		List<ObjectId> objectIDs = new ArrayList<>();
+
+		String line = pckIn.readString();
+
+		if (PacketLineIn.isEnd(line)) {
+			return builder.build();
+		}
+
+		if (!line.equals("size")) { //$NON-NLS-1$
+			throw new PackProtocolException(MessageFormat
+					.format(JGitText.get().unexpectedPacketLine, line));
+		}
+
+		for (String line2 : pckIn.readStrings()) {
+			if (!line2.startsWith("oid ")) { //$NON-NLS-1$
+				throw new PackProtocolException(MessageFormat
+						.format(JGitText.get().unexpectedPacketLine, line2));
+			}
+
+			String oidStr = line2.substring("oid ".length()); //$NON-NLS-1$
+
+			try {
+				objectIDs.add(ObjectId.fromString(oidStr));
+			} catch (InvalidObjectIdException e) {
+				throw new PackProtocolException(MessageFormat
+						.format(JGitText.get().invalidObject, oidStr), e);
+			}
+		}
+
+		return builder.setObjectIDs(objectIDs).build();
+	}
 }
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
index 79f60c3..58f8895 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
@@ -29,6 +29,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.UncheckedIOException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -37,6 +38,8 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import org.eclipse.jgit.annotations.Nullable;
 import org.eclipse.jgit.errors.InvalidObjectIdException;
@@ -441,7 +444,7 @@ public Map<String, Ref> getAdvertisedRefs() {
 	 */
 	public void setAdvertisedRefs(Map<String, Ref> allRefs,
 			Set<ObjectId> additionalHaves) {
-		refs = allRefs != null ? allRefs : db.getAllRefs();
+		refs = allRefs != null ? allRefs : getAllRefs();
 		refs = refFilter.filter(refs);
 		advertisedHaves.clear();
 
@@ -1296,6 +1299,21 @@ public ReceivedPackStatistics getReceivedPackStatistics() {
 	}
 
 	/**
+	 * Extract the full list of refs from the ref-db.
+	 *
+	 * @return Map of all refname/ref
+	 */
+	private Map<String, Ref> getAllRefs() {
+		try {
+			return db.getRefDatabase().getRefs().stream()
+					.collect(Collectors.toMap(Ref::getName,
+							Function.identity()));
+		} catch (IOException e) {
+			throw new UncheckedIOException(e);
+		}
+	}
+
+	/**
 	 * Receive a list of commands from the input.
 	 *
 	 * @throws java.io.IOException
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransferConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransferConfig.java
index 83ffd41..02be434 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransferConfig.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransferConfig.java
@@ -120,7 +120,11 @@ static ProtocolVersion parse(@Nullable String name) {
 	private final boolean allowReachableSha1InWant;
 	private final boolean allowFilter;
 	private final boolean allowSidebandAll;
+
 	private final boolean advertiseSidebandAll;
+	private final boolean advertiseWaitForDone;
+	private final boolean advertiseObjectInfo;
+
 	final @Nullable ProtocolVersion protocolVersion;
 	final String[] hideRefs;
 
@@ -206,6 +210,10 @@ public TransferConfig(Config rc) {
 				"uploadpack", "allowsidebandall", false);
 		advertiseSidebandAll = rc.getBoolean("uploadpack",
 				"advertisesidebandall", false);
+		advertiseWaitForDone = rc.getBoolean("uploadpack",
+				"advertisewaitfordone", false);
+		advertiseObjectInfo = rc.getBoolean("uploadpack",
+				"advertiseobjectinfo", false);
 	}
 
 	/**
@@ -305,6 +313,22 @@ public boolean isAdvertiseSidebandAll() {
 	}
 
 	/**
+	 * @return true to advertise wait-for-done all to the clients
+	 * @since 5.13
+	 */
+	public boolean isAdvertiseWaitForDone() {
+		return advertiseWaitForDone;
+	}
+
+	/**
+	 * @return true to advertise object-info to all clients
+	 * @since 5.13
+	 */
+	public boolean isAdvertiseObjectInfo() {
+		return advertiseObjectInfo;
+	}
+
+	/**
 	 * Get {@link org.eclipse.jgit.transport.RefFilter} respecting configured
 	 * hidden refs.
 	 *
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
index 7f1ddaa..07b348d 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
@@ -17,6 +17,7 @@
 import static org.eclipse.jgit.transport.GitProtocolConstants.CAPABILITY_SERVER_OPTION;
 import static org.eclipse.jgit.transport.GitProtocolConstants.COMMAND_FETCH;
 import static org.eclipse.jgit.transport.GitProtocolConstants.COMMAND_LS_REFS;
+import static org.eclipse.jgit.transport.GitProtocolConstants.COMMAND_OBJECT_INFO;
 import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_AGENT;
 import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_ALLOW_REACHABLE_SHA1_IN_WANT;
 import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_ALLOW_TIP_SHA1_IN_WANT;
@@ -33,6 +34,7 @@
 import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SIDE_BAND;
 import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SIDE_BAND_64K;
 import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_THIN_PACK;
+import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_WAIT_FOR_DONE;
 import static org.eclipse.jgit.transport.GitProtocolConstants.VERSION_2_REQUEST;
 import static org.eclipse.jgit.util.RefMap.toRefMap;
 
@@ -1192,9 +1194,10 @@ private void fetchV2(PacketLineOut pckOut) throws IOException {
 			walk.assumeShallow(req.getClientShallowCommits());
 
 		if (req.wasDoneReceived()) {
-			processHaveLines(req.getPeerHas(), ObjectId.zeroId(),
+			processHaveLines(
+					req.getPeerHas(), ObjectId.zeroId(),
 					new PacketLineOut(NullOutputStream.INSTANCE, false),
-					accumulator);
+					accumulator, req.wasWaitForDoneReceived() ? Option.WAIT_FOR_DONE : Option.NONE);
 		} else {
 			pckOut.writeString(
 					GitProtocolConstants.SECTION_ACKNOWLEDGMENTS + '\n');
@@ -1205,8 +1208,8 @@ private void fetchV2(PacketLineOut pckOut) throws IOException {
 			}
 			processHaveLines(req.getPeerHas(), ObjectId.zeroId(),
 					new PacketLineOut(NullOutputStream.INSTANCE, false),
-					accumulator);
-			if (okToGiveUp()) {
+					accumulator, Option.NONE);
+			if (!req.wasWaitForDoneReceived() && okToGiveUp()) {
 				pckOut.writeString("ready\n"); //$NON-NLS-1$
 			} else if (commonBase.isEmpty()) {
 				pckOut.writeString("NAK\n"); //$NON-NLS-1$
@@ -1214,7 +1217,7 @@ private void fetchV2(PacketLineOut pckOut) throws IOException {
 			sectionSent = true;
 		}
 
-		if (req.wasDoneReceived() || okToGiveUp()) {
+		if (req.wasDoneReceived() || (!req.wasWaitForDoneReceived() && okToGiveUp())) {
 			if (mayHaveShallow) {
 				if (sectionSent)
 					pckOut.writeDelim();
@@ -1267,6 +1270,32 @@ private void fetchV2(PacketLineOut pckOut) throws IOException {
 		}
 	}
 
+	private void objectInfo(PacketLineOut pckOut) throws IOException {
+		ProtocolV2Parser parser = new ProtocolV2Parser(transferConfig);
+		ObjectInfoRequest req = parser.parseObjectInfoRequest(pckIn);
+
+		protocolV2Hook.onObjectInfo(req);
+
+		ObjectReader or = getRepository().newObjectReader();
+
+		// Size is the only attribute currently supported.
+		pckOut.writeString("size"); //$NON-NLS-1$
+
+		for (ObjectId oid : req.getObjectIDs()) {
+			long size;
+			try {
+				size = or.getObjectSize(oid, ObjectReader.OBJ_ANY);
+			} catch (MissingObjectException e) {
+				throw new PackProtocolException(MessageFormat
+						.format(JGitText.get().missingObject, oid.name()), e);
+			}
+
+			pckOut.writeString(oid.getName() + " " + size); //$NON-NLS-1$
+		}
+
+		pckOut.end();
+	}
+
 	/*
 	 * Returns true if this is the last command and we should tear down the
 	 * connection.
@@ -1293,6 +1322,10 @@ private boolean serveOneCommandV2(PacketLineOut pckOut) throws IOException {
 			fetchV2(pckOut);
 			return false;
 		}
+		if (command.equals("command=" + COMMAND_OBJECT_INFO)) { //$NON-NLS-1$
+			objectInfo(pckOut);
+			return false;
+		}
 		throw new PackProtocolException(MessageFormat
 				.format(JGitText.get().unknownTransportCommand, command));
 	}
@@ -1312,6 +1345,9 @@ private List<String> getV2CapabilityAdvertisement() {
 						? OPTION_SIDEBAND_ALL + ' '
 						: "")
 				+ (cachedPackUriProvider != null ? "packfile-uris " : "")
+				+ (transferConfig.isAdvertiseWaitForDone()
+						? OPTION_WAIT_FOR_DONE + ' '
+						: "")
 				+ OPTION_SHALLOW);
 		caps.add(CAPABILITY_SERVER_OPTION);
 		return caps;
@@ -1656,7 +1692,7 @@ private boolean negotiate(FetchRequest req,
 			}
 
 			if (PacketLineIn.isEnd(line)) {
-				last = processHaveLines(peerHas, last, pckOut, accumulator);
+				last = processHaveLines(peerHas, last, pckOut, accumulator, Option.NONE);
 				if (commonBase.isEmpty() || multiAck != MultiAck.OFF)
 					pckOut.writeString("NAK\n"); //$NON-NLS-1$
 				if (noDone && sentReady) {
@@ -1671,7 +1707,7 @@ private boolean negotiate(FetchRequest req,
 				peerHas.add(ObjectId.fromString(line.substring(5)));
 				accumulator.haves++;
 			} else if (line.equals("done")) { //$NON-NLS-1$
-				last = processHaveLines(peerHas, last, pckOut, accumulator);
+				last = processHaveLines(peerHas, last, pckOut, accumulator, Option.NONE);
 
 				if (commonBase.isEmpty())
 					pckOut.writeString("NAK\n"); //$NON-NLS-1$
@@ -1687,8 +1723,14 @@ else if (multiAck != MultiAck.OFF)
 		}
 	}
 
+	private enum Option {
+		WAIT_FOR_DONE,
+		NONE;
+	}
+
 	private ObjectId processHaveLines(List<ObjectId> peerHas, ObjectId last,
-			PacketLineOut out, PackStatistics.Accumulator accumulator)
+			PacketLineOut out, PackStatistics.Accumulator accumulator,
+			Option option)
 			throws IOException {
 		preUploadHook.onBeginNegotiateRound(this, wantIds, peerHas.size());
 		if (wantAll.isEmpty() && !wantIds.isEmpty())
@@ -1754,6 +1796,18 @@ private ObjectId processHaveLines(List<ObjectId> peerHas, ObjectId last,
 		// create a pack at this point, let the client know so it stops
 		// telling us about its history.
 		//
+		if (option != Option.WAIT_FOR_DONE) {
+			sentReady = shouldGiveUp(peerHas, out, missCnt);
+		}
+
+		preUploadHook.onEndNegotiateRound(this, wantAll, haveCnt, missCnt, sentReady);
+		peerHas.clear();
+		return last;
+	}
+
+	private boolean shouldGiveUp(List<ObjectId> peerHas, PacketLineOut out, int missCnt)
+			throws IOException {
+		boolean sentReady = false;
 		boolean didOkToGiveUp = false;
 		if (0 < missCnt) {
 			for (int i = peerHas.size() - 1; i >= 0; i--) {
@@ -1765,10 +1819,12 @@ private ObjectId processHaveLines(List<ObjectId> peerHas, ObjectId last,
 						case OFF:
 							break;
 						case CONTINUE:
-							out.writeString("ACK " + id.name() + " continue\n"); //$NON-NLS-1$ //$NON-NLS-2$
+							out.writeString(
+									"ACK " + id.name() + " continue\n"); //$NON-NLS-1$ //$NON-NLS-2$
 							break;
 						case DETAILED:
-							out.writeString("ACK " + id.name() + " ready\n"); //$NON-NLS-1$ //$NON-NLS-2$
+							out.writeString(
+									"ACK " + id.name() + " ready\n"); //$NON-NLS-1$ //$NON-NLS-2$
 							sentReady = true;
 							break;
 						}
@@ -1778,15 +1834,14 @@ private ObjectId processHaveLines(List<ObjectId> peerHas, ObjectId last,
 			}
 		}
 
-		if (multiAck == MultiAck.DETAILED && !didOkToGiveUp && okToGiveUp()) {
+		if (multiAck == MultiAck.DETAILED && !didOkToGiveUp
+				&& okToGiveUp()) {
 			ObjectId id = peerHas.get(peerHas.size() - 1);
 			out.writeString("ACK " + id.name() + " ready\n"); //$NON-NLS-1$ //$NON-NLS-2$
 			sentReady = true;
 		}
 
-		preUploadHook.onEndNegotiateRound(this, wantAll, haveCnt, missCnt, sentReady);
-		peerHas.clear();
-		return last;
+		return sentReady;
 	}
 
 	private void parseWants(PackStatistics.Accumulator accumulator) throws IOException {
@@ -2335,6 +2390,7 @@ else if (ref.getName().startsWith(Constants.R_HEADS))
 							GitProtocolConstants.SECTION_PACKFILE + '\n');
 				}
 			}
+			pw.enableSearchForReuseTimeout();
 			pw.writePack(pm, NullProgressMonitor.INSTANCE, packOut);
 
 			if (msgOut != NullOutputStream.INSTANCE) {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathSuffixFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathSuffixFilter.java
index 0c74bfd..3816d5e 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathSuffixFilter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathSuffixFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, Google Inc. and others
+ * Copyright (C) 2009, 2021 Google Inc. and others
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0 which is available at
@@ -73,6 +73,15 @@ public boolean include(TreeWalk walker) throws MissingObjectException,
 
 	}
 
+	@Override
+	public int matchFilter(TreeWalk walker) throws MissingObjectException,
+			IncorrectObjectTypeException, IOException {
+		if (walker.isSubtree()) {
+			return -1;
+		}
+		return super.matchFilter(walker);
+	}
+
 	/** {@inheritDoc} */
 	@Override
 	public boolean shouldBeRecursive() {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
index 0946f64..31a0593 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
@@ -524,7 +524,7 @@ private static void write(Path p, String body) throws IOException {
 		}
 
 		private static String read(Path p) throws IOException {
-			final byte[] body = IO.readFully(p.toFile());
+			byte[] body = IO.readFully(p.toFile());
 			return new String(body, 0, body.length, UTF_8);
 		}
 
@@ -766,7 +766,7 @@ private static void saveToConfig(FileStore s,
 		}
 
 		private static String getConfigKey(FileStore s) {
-			final String storeKey;
+			String storeKey;
 			if (SystemReader.getInstance().isWindows()) {
 				Object attribute = null;
 				try {
@@ -1164,7 +1164,7 @@ public void delete(File f) throws IOException {
 	 *         platform does not require path name translation.
 	 */
 	public File resolve(File dir, String name) {
-		final File abspn = new File(name);
+		File abspn = new File(name);
 		if (abspn.isAbsolute())
 			return abspn;
 		return new File(dir, name);
@@ -1257,7 +1257,7 @@ protected File userHomeImpl() {
 	}
 
 	private File defaultUserHomeImpl() {
-		final String home = AccessController.doPrivileged(
+		String home = AccessController.doPrivileged(
 				(PrivilegedAction<String>) () -> System.getProperty("user.home") //$NON-NLS-1$
 		);
 		if (home == null || home.length() == 0)
@@ -1267,7 +1267,8 @@ private File defaultUserHomeImpl() {
 
 	/**
 	 * Searches the given path to see if it contains one of the given files.
-	 * Returns the first it finds. Returns null if not found or if path is null.
+	 * Returns the first it finds which is executable. Returns null if not found
+	 * or if path is null.
 	 *
 	 * @param path
 	 *            List of paths to search separated by File.pathSeparator
@@ -1277,14 +1278,15 @@ private File defaultUserHomeImpl() {
 	 * @since 3.0
 	 */
 	protected static File searchPath(String path, String... lookFor) {
-		if (path == null)
+		if (path == null) {
 			return null;
+		}
 
 		for (String p : path.split(File.pathSeparator)) {
 			for (String command : lookFor) {
-				final File file = new File(p, command);
+				File file = new File(p, command);
 				try {
-					if (file.isFile()) {
+					if (file.isFile() && file.canExecute()) {
 						return file.getAbsoluteFile();
 					}
 				} catch (SecurityException e) {
@@ -1339,7 +1341,7 @@ protected static String readPipe(File dir, String[] command,
 	protected static String readPipe(File dir, String[] command,
 			String encoding, Map<String, String> env)
 			throws CommandFailedException {
-		final boolean debug = LOG.isDebugEnabled();
+		boolean debug = LOG.isDebugEnabled();
 		try {
 			if (debug) {
 				LOG.debug("readpipe " + Arrays.asList(command) + "," //$NON-NLS-1$ //$NON-NLS-2$
@@ -1806,11 +1808,11 @@ public String relativize(String base, String other) {
 	 * @since 5.0
 	 */
 	public Entry[] list(File directory, FileModeStrategy fileModeStrategy) {
-		final File[] all = directory.listFiles();
+		File[] all = directory.listFiles();
 		if (all == null) {
 			return NO_ENTRIES;
 		}
-		final Entry[] result = new Entry[all.length];
+		Entry[] result = new Entry[all.length];
 		for (int i = 0; i < result.length; i++) {
 			result[i] = new FileEntry(all[i], this, fileModeStrategy);
 		}
@@ -1840,10 +1842,9 @@ public String relativize(String base, String other) {
 	 * @since 4.0
 	 */
 	public ProcessResult runHookIfPresent(Repository repository,
-			final String hookName,
-			String[] args) throws JGitInternalException {
-		return runHookIfPresent(repository, hookName, args, System.out, System.err,
-				null);
+			String hookName, String[] args) throws JGitInternalException {
+		return runHookIfPresent(repository, hookName, args, System.out,
+				System.err, null);
 	}
 
 	/**
@@ -1875,9 +1876,9 @@ public ProcessResult runHookIfPresent(Repository repository,
 	 * @since 5.11
 	 */
 	public ProcessResult runHookIfPresent(Repository repository,
-			final String hookName,
-			String[] args, OutputStream outRedirect, OutputStream errRedirect,
-			String stdinArgs) throws JGitInternalException {
+			String hookName, String[] args, OutputStream outRedirect,
+			OutputStream errRedirect, String stdinArgs)
+			throws JGitInternalException {
 		return new ProcessResult(Status.NOT_SUPPORTED);
 	}
 
@@ -1911,7 +1912,7 @@ public ProcessResult runHookIfPresent(Repository repository,
 	 * @since 5.11
 	 */
 	protected ProcessResult internalRunHookIfPresent(Repository repository,
-			final String hookName, String[] args, OutputStream outRedirect,
+			String hookName, String[] args, OutputStream outRedirect,
 			OutputStream errRedirect, String stdinArgs)
 			throws JGitInternalException {
 		File hookFile = findHook(repository, hookName);
@@ -2107,7 +2108,7 @@ public int runProcess(ProcessBuilder processBuilder,
 			OutputStream outRedirect, OutputStream errRedirect,
 			InputStream inRedirect) throws IOException,
 			InterruptedException {
-		final ExecutorService executor = Executors.newFixedThreadPool(2);
+		ExecutorService executor = Executors.newFixedThreadPool(2);
 		Process process = null;
 		// We'll record the first I/O exception that occurs, but keep on trying
 		// to dispose of our open streams and file handles
diff --git a/pom.xml b/pom.xml
index 5c5a4c7..2b94e07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <groupId>org.eclipse.jgit</groupId>
   <artifactId>org.eclipse.jgit-parent</artifactId>
   <packaging>pom</packaging>
-  <version>5.12.1-SNAPSHOT</version>
+  <version>5.13.0-SNAPSHOT</version>
 
   <name>JGit - Parent</name>
   <url>${jgit-url}</url>
@@ -151,18 +151,18 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <bundle-manifest>${project.build.directory}/META-INF/MANIFEST.MF</bundle-manifest>
 
-    <jgit-last-release-version>5.11.0.202103091610-r</jgit-last-release-version>
-    <apache-sshd-version>2.6.0</apache-sshd-version>
+    <jgit-last-release-version>5.12.0.202106070339-r</jgit-last-release-version>
+    <apache-sshd-version>2.7.0</apache-sshd-version>
     <jsch-version>0.1.55</jsch-version>
     <jzlib-version>1.1.1</jzlib-version>
-    <javaewah-version>1.1.7</javaewah-version>
+    <javaewah-version>1.1.12</javaewah-version>
     <junit-version>4.13</junit-version>
     <test-fork-count>1C</test-fork-count>
     <args4j-version>2.33</args4j-version>
-    <commons-compress-version>1.19</commons-compress-version>
+    <commons-compress-version>1.20</commons-compress-version>
     <osgi-core-version>4.3.1</osgi-core-version>
     <servlet-api-version>3.1.0</servlet-api-version>
-    <jetty-version>9.4.41.v20210516</jetty-version>
+    <jetty-version>9.4.43.v20210629</jetty-version>
     <japicmp-version>0.15.3</japicmp-version>
     <httpclient-version>4.5.13</httpclient-version>
     <httpcore-version>4.4.14</httpcore-version>
@@ -170,15 +170,17 @@
     <log4j-version>1.2.15</log4j-version>
     <maven-javadoc-plugin-version>3.3.0</maven-javadoc-plugin-version>
     <tycho-extras-version>1.7.0</tycho-extras-version>
-    <gson-version>2.8.6</gson-version>
-    <bouncycastle-version>1.65</bouncycastle-version>
-    <spotbugs-maven-plugin-version>4.2.3</spotbugs-maven-plugin-version>
+    <gson-version>2.8.7</gson-version>
+    <bouncycastle-version>1.69</bouncycastle-version>
+    <spotbugs-maven-plugin-version>4.3.0</spotbugs-maven-plugin-version>
     <maven-project-info-reports-plugin-version>3.1.2</maven-project-info-reports-plugin-version>
-    <maven-jxr-plugin-version>3.0.0</maven-jxr-plugin-version>
+    <maven-jxr-plugin-version>3.1.1</maven-jxr-plugin-version>
     <maven-surefire-plugin-version>3.0.0-M5</maven-surefire-plugin-version>
     <maven-surefire-report-plugin-version>${maven-surefire-plugin-version}</maven-surefire-report-plugin-version>
     <maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version>
     <plexus-compiler-version>2.8.8</plexus-compiler-version>
+    <hamcrest-version>2.2</hamcrest-version>
+    <assertj-version>3.20.2</assertj-version>
 
     <!-- Properties to enable jacoco code coverage analysis -->
     <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
@@ -255,7 +257,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.1.2</version>
+          <version>3.2.0</version>
         </plugin>
 
         <plugin>
@@ -345,7 +347,7 @@
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.8.6</version>
+          <version>0.8.7</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -705,7 +707,7 @@
       <dependency>
         <groupId>org.tukaani</groupId>
         <artifactId>xz</artifactId>
-        <version>1.8</version>
+        <version>1.9</version>
         <optional>true</optional>
       </dependency>
 
@@ -784,7 +786,13 @@
       <dependency>
         <groupId>org.bouncycastle</groupId>
         <artifactId>bcprov-jdk15on</artifactId>
-        <version>1.65.01</version>
+        <version>${bouncycastle-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcutil-jdk15on</artifactId>
+        <version>${bouncycastle-version}</version>
       </dependency>
 
       <dependency>
@@ -796,7 +804,7 @@
       <dependency>
         <groupId>org.assertj</groupId>
         <artifactId>assertj-core</artifactId>
-        <version>3.14.0</version>
+        <version>${assertj-version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>