diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2024-05-05 10:56:32 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-05-08 02:47:05 +0200 |
| commit | 026d46de13eb2321c18045469f27b065ba107ff5 (patch) | |
| tree | 7b81ca681d8ea1e7818aa8da313f510440dd1626 /org.eclipse.jgit.lfs.server.test | |
| parent | a31580f459b0ae24b51c519ce71ad728ff156c8f (diff) | |
| download | jgit-026d46de13eb2321c18045469f27b065ba107ff5.tar.gz jgit-026d46de13eb2321c18045469f27b065ba107ff5.zip | |
Bump jetty version to 12.0.9 and servlet-api to 6.0next
Bug: jgit-41
Change-Id: Ib3e42581db2dd88043a1a67d606795501b8019f4
Diffstat (limited to 'org.eclipse.jgit.lfs.server.test')
3 files changed, 18 insertions, 18 deletions
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 737ff3f14e..8e41ee3d28 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -7,25 +7,25 @@ Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: jakarta.servlet;version="[5.0.0,6.0.0)", - jakarta.servlet.http;version="[5.0.0,6.0.0)", +Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", + jakarta.servlet.http;version="[6.0.0,7.0.0)", org.apache.http;version="[4.4.0,5.0.0)", org.apache.http.client;version="[4.4.0,5.0.0)", org.apache.http.client.methods;version="[4.4.0,5.0.0)", org.apache.http.entity;version="[4.4.0,5.0.0)", org.apache.http.impl.client;version="[4.4.0,5.0.0)", - org.eclipse.jetty.http;version="[11.0.0,12.0.0)", - org.eclipse.jetty.io;version="[11.0.0,12.0.0)", - org.eclipse.jetty.security;version="[11.0.0,12.0.0)", - org.eclipse.jetty.security.authentication;version="[11.0.0,12.0.0)", - org.eclipse.jetty.server;version="[11.0.0,12.0.0)", - org.eclipse.jetty.server.handler;version="[11.0.0,12.0.0)", - org.eclipse.jetty.servlet;version="[11.0.0,12.0.0)", - org.eclipse.jetty.util;version="[11.0.0,12.0.0)", - org.eclipse.jetty.util.component;version="[11.0.0,12.0.0)", - org.eclipse.jetty.util.log;version="[11.0.0,12.0.0)", - org.eclipse.jetty.util.security;version="[11.0.0,12.0.0)", - org.eclipse.jetty.util.thread;version="[11.0.0,12.0.0)", + org.eclipse.jetty.ee10.servlet;version="[12.0.0,13.0.0)", + org.eclipse.jetty.http;version="[12.0.0,13.0.0)", + org.eclipse.jetty.io;version="[12.0.0,13.0.0)", + org.eclipse.jetty.security;version="[12.0.0,13.0.0)", + org.eclipse.jetty.security.authentication;version="[12.0.0,13.0.0)", + org.eclipse.jetty.session;version="[12.0.0,13.0.0)", + org.eclipse.jetty.server;version="[12.0.0,13.0.0)", + org.eclipse.jetty.server.handler;version="[12.0.0,13.0.0)", + org.eclipse.jetty.util;version="[12.0.0,13.0.0)", + org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", + org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", + org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", org.eclipse.jgit.api;version="[7.0.0,7.1.0)", org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 9cdd7a9f22..49c1023ef0 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -74,8 +74,8 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-servlet</artifactId> <scope>test</scope> </dependency> diff --git a/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/LfsServerTest.java b/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/LfsServerTest.java index b2b9ee010b..9a49023fcb 100644 --- a/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/LfsServerTest.java +++ b/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/LfsServerTest.java @@ -39,8 +39,8 @@ import org.apache.http.entity.InputStreamEntity; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee10.servlet.ServletHolder; import org.eclipse.jgit.junit.MockSystemReader; import org.eclipse.jgit.junit.http.AppServer; import org.eclipse.jgit.lfs.errors.LfsException; |