summaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2022-01-18 18:09:03 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2022-01-18 18:09:03 +0100
commitd017a655dfbdac2393ec645c6864e190cf55516c (patch)
tree78ac24871d7ff3ce5ea999c8276e301950ee7080 /pom.xml
parentd30447e2699d217fe70b52c4fa74674445e48f64 (diff)
parentde1abd323763dc88c46dbbfaca6e23b640a4ce5e (diff)
downloadjgit-d017a655dfbdac2393ec645c6864e190cf55516c.tar.gz
jgit-d017a655dfbdac2393ec645c6864e190cf55516c.zip
Merge branch 'stable-6.0'
* stable-6.0: UploadPack v2 protocol: Stop negotiation for orphan refs Complete update to servlet api 4.0.0 Change-Id: I55ab6e8fd4a76e4313e37b12f9fc5d5e4b84a681
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/pom.xml b/pom.xml
index e6daf17a00..e2689de36e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,7 +161,7 @@
<args4j-version>2.33</args4j-version>
<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>
+ <servlet-api-version>4.0.0</servlet-api-version>
<jetty-version>10.0.6</jetty-version>
<japicmp-version>0.15.3</japicmp-version>
<httpclient-version>4.5.13</httpclient-version>