diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2021-11-24 17:49:02 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2021-11-24 17:49:02 +0100 |
| commit | 751e3ad5d1f67018421d53e3ae03444ff6f5d840 (patch) | |
| tree | dea7ca864cd25434de1370cad1ec5bfe30ee7291 /pom.xml | |
| parent | 6807661d39a43909c946e4dc1359db13dcf9d24a (diff) | |
| parent | fc60efff0d92b25c21be5fdbe84c17670ccb0288 (diff) | |
| download | jgit-751e3ad5d1f67018421d53e3ae03444ff6f5d840.tar.gz jgit-751e3ad5d1f67018421d53e3ae03444ff6f5d840.zip | |
Merge branch 'master' into stable-6.0
* master:
Add 4.22 target platform for 2021-12
Update Orbit to R20211122181901 for 2021-12
AppServer: fix keystore used to setup test SSL context factory
[6.0 API cleanup] Public interface for PackLock
[6.0 API cleanup] StoredObjectRepresentationNotAvailableException
RepoCommand: Do not wrap GitApiExceptions in GitApiExceptions
Set JSch global config values only if not set already
Better git system config finding
[6.0 API cleanup] CancelledException vs. CanceledException
Javadoc fixes
Better git system config finding
HttpClientConnectionTest: organize imports
Update Jetty to 10.0.6
Fix missing @since 6.0 tag
Support commit.template config property
DFS block cache: harden against race over ref locks.
Change-Id: Id9814d92eb40b2ba63c5e753a86a4809826e7c81
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -162,7 +162,7 @@ <commons-compress-version>1.21</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.44.v20210927</jetty-version> + <jetty-version>10.0.6</jetty-version> <japicmp-version>0.15.3</japicmp-version> <httpclient-version>4.5.13</httpclient-version> <httpcore-version>4.4.14</httpcore-version> |