Matthias Sohn 1aa3cf7f41 Merge branch 'master' into next ... * master: (34 commits) Remove texts which were added by mistake in 00386272 Fix formatting which was broken in 00386272 LockFile: create OutputStream only when needed Add a cgit interoperability test for LockFile Add TemporaryBuffer.toString(int limit) LockFile: create OutputStream only when needed Prepare 5.12.0-SNAPSHOT builds JGit v5.12.0.202105051250-m2 Update jetty to 9.4.40.v20210413 [releng] Update eclipse-jarsigner-plugin to 1.3.1 Implement ours/theirs content conflict resolution ssh: ensure list is modifiable before using Iterator.remove(). Update orbit to S20210406213021 and add 4.20-staging target Fix typo in test method name Allow file mode conflicts in virtual base commit on recursive merge. sshd: don't lock the known_hosts files on reading Allow info messages in UsernamePasswordCredentialsProvider ssh config: do environment variable replacement sshd: implement server-sig-algs SSH extension (client side) Upgrade ecj to 3.25.0 ... Change-Id: Ibc39a9c4e431d15b67ab4a307241f47a7f3740a9		2021-05-12 08:59:07 +02:00
..
.settings	Enable and fix "Statement unnecessarily nested within else clause" warnings	2019-10-17 10:20:14 +09:00
META-INF	Prepare 5.12.0-SNAPSHOT builds	2021-03-10 16:34:28 +01:00
resources/org/eclipse/jgit/http/server	Skip logging stack trace on corrupt objects	2015-05-06 16:02:27 -07:00
src/org/eclipse/jgit/http/server	Rename PackFile to Pack	2021-02-10 22:46:15 -07:00
.classpath	Change JGit minimum execution environment to JavaSE-1.8	2016-09-20 11:32:36 +02:00
.fbprefs	Simple dumb HTTP server for Git	2010-01-12 12:01:24 -08:00
.gitignore	Simple dumb HTTP server for Git	2010-01-12 12:01:24 -08:00
.project	Enforce the use of Java5 API:s only (with a few exceptions)	2011-12-16 01:01:36 +01:00
BUILD	Bazel: Add fixes for --incompatible_load_java_rules_from_bzl	2019-09-07 15:36:11 +09:00
about.html	Add missing about.html files to all shipped bundles	2011-06-08 21:51:51 +02:00
build.properties	Add missing resources from source.. in build.properties	2013-10-30 17:42:38 +01:00
plugin.properties	Fix bundle localization of Apache SSH bundle	2019-06-21 17:54:06 +02:00
pom.xml	Merge branch 'master' into next	2021-05-12 08:59:07 +02:00