summaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2024-06-30 09:31:52 +0000
committerGerrit Code Review <support@gerrithub.io>2024-06-30 09:31:52 +0000
commit2f1873be7a2a7387482ac828edfef927f5c499bb (patch)
tree14abbe57b2c3d03dd16c1705d5ca9f26ab8a2828 /pom.xml
parentf2c984422ed4b4d68a9f4ff7dc3e42b35601236e (diff)
parent8261854fb72ea8921d08204e420ec1d63489d0b2 (diff)
downloadjgit-2f1873be7a2a7387482ac828edfef927f5c499bb.tar.gz
jgit-2f1873be7a2a7387482ac828edfef927f5c499bb.zip
Merge "Merge branch 'next'"
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml18
1 files changed, 12 insertions, 6 deletions
diff --git a/pom.xml b/pom.xml
index df021372fb..676e75c23e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,7 +113,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>11</java.version>
+ <java.version>17</java.version>
<bundle-manifest>${project.build.directory}/META-INF/MANIFEST.MF</bundle-manifest>
<project.build.outputTimestamp>${commit.time.iso}</project.build.outputTimestamp>
@@ -129,8 +129,8 @@
<args4j-version>2.37</args4j-version>
<commons-compress-version>1.26.2</commons-compress-version>
<osgi-core-version>6.0.0</osgi-core-version>
- <servlet-api-version>4.0.4</servlet-api-version>
- <jetty-version>10.0.21</jetty-version>
+ <servlet-api-version>6.0.0</servlet-api-version>
+ <jetty-version>12.0.9</jetty-version>
<japicmp-version>0.21.2</japicmp-version>
<httpclient-version>4.5.14</httpclient-version>
<httpcore-version>4.4.16</httpcore-version>
@@ -479,7 +479,7 @@
<failOnWarnings>true</failOnWarnings>
<excludePackageNames>org.eclipse.jgit.http.test</excludePackageNames>
<links>
- <link>https://docs.oracle.com/en/java/javase/11/docs/api</link>
+ <link>https://docs.oracle.com/en/java/javase/17/docs/api</link>
</links>
<tags>
<tag>
@@ -753,7 +753,7 @@
<failOnWarnings>false</failOnWarnings>
<excludePackageNames>org.eclipse.jgit.http.test</excludePackageNames>
<links>
- <link>https://docs.oracle.com/en/java/javase/11/docs/api</link>
+ <link>https://docs.oracle.com/en/java/javase/17/docs/api</link>
</links>
<tags>
<tag>
@@ -915,8 +915,14 @@
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty.ee10</groupId>
+ <artifactId>jetty-ee10-servlet</artifactId>
+ <version>${jetty-version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
+ <artifactId>jetty-session</artifactId>
<version>${jetty-version}</version>
</dependency>