diff options
93 files changed, 1154 insertions, 457 deletions
@@ -156,8 +156,8 @@ maven_jar( maven_jar( name = "servlet-api", - artifact = "jakarta.servlet:jakarta.servlet-api:6.1.0", - sha1 = "1169a246913fe3823782af7943e7a103634867c5", + artifact = "jakarta.servlet:jakarta.servlet-api:4.0.4", + sha1 = "b8a1142e04838fe54194049c6e7a18dae8f9b960", ) maven_jar( @@ -244,8 +244,14 @@ JETTY_VER = "12.0.23" maven_jar( name = "jetty-servlet", - artifact = "org.eclipse.jetty.ee10:jetty-ee10-servlet:" + JETTY_VER, - sha1 = "0cfb3fd22fe5f298437932ae2b595c8bdbd393f0", + artifact = "org.eclipse.jetty.ee8:jetty-ee8-servlet:" + JETTY_VER, + sha1 = "87eb6b1fc7c6f6f130984288ce0ba311c7ebc48b", +) + +maven_jar( + name = "jetty-nested", + artifact = "org.eclipse.jetty.ee8:jetty-ee8-nested:" + JETTY_VER, + sha1 = "88a49929c83964263ce1350f7ed414abfda6a936", ) maven_jar( @@ -255,6 +261,12 @@ maven_jar( ) maven_jar( + name = "jetty-ee8-security", + artifact = "org.eclipse.jetty.ee8:jetty-ee8-security:" + JETTY_VER, + sha1 = "0f7d8c859095af69cb350b72659c5e0efddc80e0", +) + +maven_jar( name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER, sha1 = "c8618ac7741fd278dba2ff77c3cf5229e2235356", @@ -184,25 +184,19 @@ java_library( ) java_library( - name = "jetty-ee10-nested", + name = "jetty-ee8-nested", # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. visibility = ["//visibility:public"], - exports = ["@jetty-ee10-nested//jar"], + exports = ["@jetty-nested//jar"], ) java_library( - name = "jetty-ee10-security", + name = "jetty-ee8-security", # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. visibility = ["//visibility:public"], - exports = ["@jetty-ee10-security//jar"], + exports = ["@jetty-ee8-security//jar"], ) -java_library( - name = "jetty-ee10-servlet", - # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. - visibility = ["//visibility:public"], - exports = ["@jetty-ee10-servlet//jar"], -) java_library( name = "jsch", diff --git a/org.eclipse.jgit.http.server/.settings/.api_filters b/org.eclipse.jgit.http.server/.settings/.api_filters new file mode 100644 index 0000000000..3a22befdf3 --- /dev/null +++ b/org.eclipse.jgit.http.server/.settings/.api_filters @@ -0,0 +1,515 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.jgit.http.server" version="2"> + <resource path="src/org/eclipse/jgit/http/server/ClientVersionUtil.java" type="org.eclipse.jgit.http.server.ClientVersionUtil"> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.ClientVersionUtil"/> + <message_argument value="hasChunkedEncodingRequestBug(int[], HttpServletRequest)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="hasChunkedEncodingRequestBug(int[], HttpServletRequest)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/http/server/GitFilter.java" type="org.eclipse.jgit.http.server.GitFilter"> + <filter id="337682486"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.GitFilter"/> + <message_argument value="jakarta.servlet.Filter"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.GitFilter"/> + <message_argument value="addReceivePackFilter(Filter)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.GitFilter"/> + <message_argument value="addUploadPackFilter(Filter)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.GitFilter"/> + <message_argument value="init(FilterConfig)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="addReceivePackFilter(Filter)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="addUploadPackFilter(Filter)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/http/server/GitServlet.java" type="org.eclipse.jgit.http.server.GitServlet"> + <filter id="337682486"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.GitServlet"/> + <message_argument value="jakarta.servlet.ServletConfig,jakarta.servlet.Servlet"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.GitServlet"/> + <message_argument value="addReceivePackFilter(Filter)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.GitServlet"/> + <message_argument value="addUploadPackFilter(Filter)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.GitServlet"/> + <message_argument value="init(ServletConfig)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="addReceivePackFilter(Filter)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="addUploadPackFilter(Filter)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/http/server/GitSmartHttpTools.java" type="org.eclipse.jgit.http.server.GitSmartHttpTools"> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.GitSmartHttpTools"/> + <message_argument value="getResponseContentType(HttpServletRequest)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.GitSmartHttpTools"/> + <message_argument value="isGitClient(HttpServletRequest)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.GitSmartHttpTools"/> + <message_argument value="isInfoRefs(HttpServletRequest)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.GitSmartHttpTools"/> + <message_argument value="isReceivePack(HttpServletRequest)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.GitSmartHttpTools"/> + <message_argument value="isUploadPack(HttpServletRequest)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.GitSmartHttpTools"/> + <message_argument value="sendError(HttpServletRequest, HttpServletResponse, int)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.GitSmartHttpTools"/> + <message_argument value="sendError(HttpServletRequest, HttpServletResponse, int, String)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="getResponseContentType(HttpServletRequest)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="isGitClient(HttpServletRequest)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="isInfoRefs(HttpServletRequest)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="isReceivePack(HttpServletRequest)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="isUploadPack(HttpServletRequest)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="sendError(HttpServletRequest, HttpServletResponse, int)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="sendError(HttpServletRequest, HttpServletResponse, int, String)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/http/server/ReceivePackErrorHandler.java" type="org.eclipse.jgit.http.server.ReceivePackErrorHandler"> + <filter id="403804204"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.ReceivePackErrorHandler"/> + <message_argument value="receive(HttpServletRequest, HttpServletResponse, ReceivePackErrorHandler.ReceivePackRunnable)"/> + </message_arguments> + </filter> + <filter id="405901410"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.ReceivePackErrorHandler"/> + <message_argument value="receive(HttpServletRequest, HttpServletResponse, ReceivePackErrorHandler.ReceivePackRunnable)"/> + </message_arguments> + </filter> + <filter id="1209008130"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="receive(HttpServletRequest, HttpServletResponse, ReceivePackErrorHandler.ReceivePackRunnable)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/http/server/RepositoryFilter.java" type="org.eclipse.jgit.http.server.RepositoryFilter"> + <filter id="337682486"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.RepositoryFilter"/> + <message_argument value="jakarta.servlet.Filter"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.RepositoryFilter"/> + <message_argument value="doFilter(ServletRequest, ServletResponse, FilterChain)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.RepositoryFilter"/> + <message_argument value="init(FilterConfig)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/http/server/ServletUtils.java" type="org.eclipse.jgit.http.server.ServletUtils"> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.ServletUtils"/> + <message_argument value="consumeRequestBody(HttpServletRequest)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.ServletUtils"/> + <message_argument value="getInputStream(HttpServletRequest)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.ServletUtils"/> + <message_argument value="getRepository(ServletRequest)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.ServletUtils"/> + <message_argument value="send(byte[], HttpServletRequest, HttpServletResponse)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.ServletUtils"/> + <message_argument value="sendPlainText(String, HttpServletRequest, HttpServletResponse)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="consumeRequestBody(HttpServletRequest)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="getInputStream(HttpServletRequest)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="getRepository(ServletRequest)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="send(byte[], HttpServletRequest, HttpServletResponse)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="sendPlainText(String, HttpServletRequest, HttpServletResponse)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/http/server/UploadPackErrorHandler.java" type="org.eclipse.jgit.http.server.UploadPackErrorHandler"> + <filter id="403804204"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.UploadPackErrorHandler"/> + <message_argument value="upload(HttpServletRequest, HttpServletResponse, UploadPackErrorHandler.UploadPackRunnable)"/> + </message_arguments> + </filter> + <filter id="405901410"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.UploadPackErrorHandler"/> + <message_argument value="upload(HttpServletRequest, HttpServletResponse, UploadPackErrorHandler.UploadPackRunnable)"/> + </message_arguments> + </filter> + <filter id="1209008130"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="upload(HttpServletRequest, HttpServletResponse, UploadPackErrorHandler.UploadPackRunnable)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/http/server/glue/ErrorServlet.java" type="org.eclipse.jgit.http.server.glue.ErrorServlet"> + <filter id="337682486"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.glue.ErrorServlet"/> + <message_argument value="jakarta.servlet.ServletConfig,jakarta.servlet.Servlet"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.glue.ErrorServlet"/> + <message_argument value="doGet(HttpServletRequest, HttpServletResponse)"/> + </message_arguments> + </filter> + <filter id="338849923"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.glue.ErrorServlet"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/http/server/glue/MetaFilter.java" type="org.eclipse.jgit.http.server.glue.MetaFilter"> + <filter id="337682486"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.glue.MetaFilter"/> + <message_argument value="jakarta.servlet.Filter"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.glue.MetaFilter"/> + <message_argument value="doFilter(ServletRequest, ServletResponse, FilterChain)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.glue.MetaFilter"/> + <message_argument value="init(FilterConfig)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/http/server/glue/MetaServlet.java" type="org.eclipse.jgit.http.server.glue.MetaServlet"> + <filter id="337682486"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.glue.MetaServlet"/> + <message_argument value="jakarta.servlet.ServletConfig,jakarta.servlet.Servlet"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.glue.MetaServlet"/> + <message_argument value="init(ServletConfig)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.glue.MetaServlet"/> + <message_argument value="service(HttpServletRequest, HttpServletResponse)"/> + </message_arguments> + </filter> + <filter id="338849923"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.glue.MetaServlet"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/http/server/glue/RegexGroupFilter.java" type="org.eclipse.jgit.http.server.glue.RegexGroupFilter"> + <filter id="337682486"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.glue.RegexGroupFilter"/> + <message_argument value="jakarta.servlet.Filter"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.glue.RegexGroupFilter"/> + <message_argument value="doFilter(ServletRequest, ServletResponse, FilterChain)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.glue.RegexGroupFilter"/> + <message_argument value="init(FilterConfig)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/http/server/glue/ServletBinder.java" type="org.eclipse.jgit.http.server.glue.ServletBinder"> + <filter id="403804204"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.glue.ServletBinder"/> + <message_argument value="through(Filter)"/> + </message_arguments> + </filter> + <filter id="403804204"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.glue.ServletBinder"/> + <message_argument value="with(HttpServlet)"/> + </message_arguments> + </filter> + <filter id="405901410"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.glue.ServletBinder"/> + <message_argument value="through(Filter)"/> + </message_arguments> + </filter> + <filter id="405901410"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.glue.ServletBinder"/> + <message_argument value="with(HttpServlet)"/> + </message_arguments> + </filter> + <filter id="1209008130"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="through(Filter)"/> + </message_arguments> + </filter> + <filter id="1209008130"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="with(HttpServlet)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/http/server/glue/WrappedRequest.java" type="org.eclipse.jgit.http.server.glue.WrappedRequest"> + <filter id="337682486"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.glue.WrappedRequest"/> + <message_argument value="jakarta.servlet.http.HttpServletRequest,jakarta.servlet.ServletRequest"/> + </message_arguments> + </filter> + <filter id="338722907"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.glue.WrappedRequest"/> + <message_argument value="WrappedRequest(HttpServletRequest, String, String)"/> + </message_arguments> + </filter> + <filter id="338849923"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.glue.WrappedRequest"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="WrappedRequest(HttpServletRequest, String, String)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/http/server/resolver/AsIsFileService.java" type="org.eclipse.jgit.http.server.resolver.AsIsFileService"> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.resolver.AsIsFileService"/> + <message_argument value="access(HttpServletRequest, Repository)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="access(HttpServletRequest, Repository)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/http/server/resolver/DefaultReceivePackFactory.java" type="org.eclipse.jgit.http.server.resolver.DefaultReceivePackFactory"> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.resolver.DefaultReceivePackFactory"/> + <message_argument value="create(HttpServletRequest, Repository)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="create(HttpServletRequest, Repository)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/http/server/resolver/DefaultUploadPackFactory.java" type="org.eclipse.jgit.http.server.resolver.DefaultUploadPackFactory"> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.http.server.resolver.DefaultUploadPackFactory"/> + <message_argument value="create(HttpServletRequest, Repository)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="create(HttpServletRequest, Repository)"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index d67e255e19..004981684d 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -8,17 +8,17 @@ Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.4.0", org.eclipse.jgit.http.server.glue;version="7.4.0"; - uses:="jakarta.servlet, - jakarta.servlet.http", + uses:="javax.servlet, + javax.servlet.http", org.eclipse.jgit.http.server.resolver;version="7.4.0"; - uses:="jakarta.servlet.http + uses:="javax.servlet.http org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", - jakarta.servlet.http;version="[6.0.0,7.0.0)", +Import-Package: javax.servlet;version="[4.0.0,5.0.0)", + javax.servlet.http;version="[4.0.0,5.0.0)", org.eclipse.jgit.annotations;version="[7.4.0,7.5.0)", org.eclipse.jgit.errors;version="[7.4.0,7.5.0)", org.eclipse.jgit.internal.storage.dfs;version="[7.4.0,7.5.0)", diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/AsIsFileFilter.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/AsIsFileFilter.java index add535307f..fb74dc7024 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/AsIsFileFilter.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/AsIsFileFilter.java @@ -10,20 +10,20 @@ package org.eclipse.jgit.http.server; -import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN; -import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; +import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; +import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; import static org.eclipse.jgit.http.server.ServletUtils.getRepository; import java.io.IOException; -import jakarta.servlet.Filter; -import jakarta.servlet.FilterChain; -import jakarta.servlet.FilterConfig; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.http.server.resolver.AsIsFileService; import org.eclipse.jgit.lib.Repository; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ClientVersionUtil.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ClientVersionUtil.java index 22fa345942..184cdef36e 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ClientVersionUtil.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ClientVersionUtil.java @@ -10,7 +10,7 @@ package org.eclipse.jgit.http.server; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; /** * Parses Git client User-Agent strings. diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/FileSender.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/FileSender.java index 941e8adae0..ec531822fb 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/FileSender.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/FileSender.java @@ -10,8 +10,8 @@ package org.eclipse.jgit.http.server; -import static jakarta.servlet.http.HttpServletResponse.SC_PARTIAL_CONTENT; -import static jakarta.servlet.http.HttpServletResponse.SC_REQUESTED_RANGE_NOT_SATISFIABLE; +import static javax.servlet.http.HttpServletResponse.SC_PARTIAL_CONTENT; +import static javax.servlet.http.HttpServletResponse.SC_REQUESTED_RANGE_NOT_SATISFIABLE; import static org.eclipse.jgit.util.HttpSupport.HDR_ACCEPT_RANGES; import static org.eclipse.jgit.util.HttpSupport.HDR_CONTENT_LENGTH; import static org.eclipse.jgit.util.HttpSupport.HDR_CONTENT_RANGE; @@ -28,8 +28,8 @@ import java.text.MessageFormat; import java.time.Instant; import java.util.Enumeration; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.util.FS; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitFilter.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitFilter.java index 8adeddd9d3..655b3997e3 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitFilter.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitFilter.java @@ -15,11 +15,11 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; -import jakarta.servlet.Filter; -import jakarta.servlet.FilterConfig; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.Filter; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.http.server.glue.ErrorServlet; import org.eclipse.jgit.http.server.glue.MetaFilter; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitServlet.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitServlet.java index eadab21846..d293466cd6 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitServlet.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitServlet.java @@ -12,12 +12,12 @@ package org.eclipse.jgit.http.server; import java.util.Enumeration; -import jakarta.servlet.Filter; -import jakarta.servlet.FilterConfig; -import jakarta.servlet.ServletConfig; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.Filter; +import javax.servlet.FilterConfig; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; import org.eclipse.jgit.http.server.glue.MetaServlet; import org.eclipse.jgit.http.server.resolver.AsIsFileService; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitSmartHttpTools.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitSmartHttpTools.java index bf3da4b5d0..b7abdea90d 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitSmartHttpTools.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitSmartHttpTools.java @@ -10,9 +10,9 @@ package org.eclipse.jgit.http.server; -import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN; -import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; +import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import static org.eclipse.jgit.http.server.ServletUtils.ATTRIBUTE_HANDLER; import static org.eclipse.jgit.transport.GitProtocolConstants.CAPABILITY_SIDE_BAND_64K; import static org.eclipse.jgit.transport.SideBandOutputStream.CH_ERROR; @@ -25,8 +25,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.internal.transport.parser.FirstCommand; import org.eclipse.jgit.lib.Constants; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/InfoPacksServlet.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/InfoPacksServlet.java index 74a6da9669..d94cc41268 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/InfoPacksServlet.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/InfoPacksServlet.java @@ -15,9 +15,9 @@ import static org.eclipse.jgit.http.server.ServletUtils.sendPlainText; import java.io.IOException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.internal.storage.file.ObjectDirectory; import org.eclipse.jgit.internal.storage.file.Pack; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/InfoRefsServlet.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/InfoRefsServlet.java index 632cbaf915..4d86be1916 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/InfoRefsServlet.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/InfoRefsServlet.java @@ -16,9 +16,9 @@ import static org.eclipse.jgit.http.server.ServletUtils.getRepository; import java.io.IOException; import java.io.OutputStreamWriter; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Repository; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/IsLocalFilter.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/IsLocalFilter.java index 2a65a7fba8..434cdb48d1 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/IsLocalFilter.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/IsLocalFilter.java @@ -10,18 +10,18 @@ package org.eclipse.jgit.http.server; -import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN; +import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; import static org.eclipse.jgit.http.server.ServletUtils.getRepository; import java.io.IOException; -import jakarta.servlet.Filter; -import jakarta.servlet.FilterChain; -import jakarta.servlet.FilterConfig; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.internal.storage.file.ObjectDirectory; import org.eclipse.jgit.lib.Repository; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/NoCacheFilter.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/NoCacheFilter.java index 65ec579fd8..b1a2b30995 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/NoCacheFilter.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/NoCacheFilter.java @@ -16,13 +16,13 @@ import static org.eclipse.jgit.util.HttpSupport.HDR_PRAGMA; import java.io.IOException; -import jakarta.servlet.Filter; -import jakarta.servlet.FilterChain; -import jakarta.servlet.FilterConfig; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletResponse; /** Add HTTP response headers to prevent caching by proxies/browsers. */ class NoCacheFilter implements Filter { diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ObjectFileServlet.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ObjectFileServlet.java index 81ff9630de..e581707ccf 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ObjectFileServlet.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ObjectFileServlet.java @@ -10,8 +10,8 @@ package org.eclipse.jgit.http.server; -import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; -import static jakarta.servlet.http.HttpServletResponse.SC_NOT_MODIFIED; +import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import static javax.servlet.http.HttpServletResponse.SC_NOT_MODIFIED; import static org.eclipse.jgit.http.server.ServletUtils.getRepository; import static org.eclipse.jgit.util.HttpSupport.HDR_ETAG; import static org.eclipse.jgit.util.HttpSupport.HDR_IF_MODIFIED_SINCE; @@ -23,10 +23,10 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.time.Instant; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.internal.storage.file.ObjectDirectory; import org.eclipse.jgit.lib.Repository; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackErrorHandler.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackErrorHandler.java index 843a11556e..c55048aa79 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackErrorHandler.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackErrorHandler.java @@ -11,8 +11,8 @@ package org.eclipse.jgit.http.server; import java.io.IOException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.transport.ReceivePack; import org.eclipse.jgit.transport.ServiceMayNotContinueException; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackServlet.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackServlet.java index 959d6a54cb..56b4c80743 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackServlet.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackServlet.java @@ -10,10 +10,10 @@ package org.eclipse.jgit.http.server; -import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN; -import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; -import static jakarta.servlet.http.HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE; +import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; +import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; +import static javax.servlet.http.HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE; import static org.eclipse.jgit.http.server.GitSmartHttpTools.RECEIVE_PACK; import static org.eclipse.jgit.http.server.GitSmartHttpTools.RECEIVE_PACK_REQUEST_TYPE; import static org.eclipse.jgit.http.server.GitSmartHttpTools.RECEIVE_PACK_RESULT_TYPE; @@ -28,15 +28,15 @@ import java.io.IOException; import java.text.MessageFormat; import java.util.List; -import jakarta.servlet.Filter; -import jakarta.servlet.FilterChain; -import jakarta.servlet.FilterConfig; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.errors.CorruptObjectException; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/RepositoryFilter.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/RepositoryFilter.java index ab45b460f9..9ff922bd7d 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/RepositoryFilter.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/RepositoryFilter.java @@ -10,25 +10,25 @@ package org.eclipse.jgit.http.server; -import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN; -import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; -import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; +import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; +import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; import static org.eclipse.jgit.http.server.GitSmartHttpTools.sendError; import static org.eclipse.jgit.http.server.ServletUtils.ATTRIBUTE_REPOSITORY; import java.io.IOException; import java.text.MessageFormat; -import jakarta.servlet.Filter; -import jakarta.servlet.FilterChain; -import jakarta.servlet.FilterConfig; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.lib.Repository; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ServletUtils.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ServletUtils.java index 79815c2c06..474e3c9d3a 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ServletUtils.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ServletUtils.java @@ -27,9 +27,9 @@ import java.text.MessageFormat; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/SmartOutputStream.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/SmartOutputStream.java index 19df895aac..fdac79d4b0 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/SmartOutputStream.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/SmartOutputStream.java @@ -18,8 +18,8 @@ import java.io.IOException; import java.io.OutputStream; import java.util.zip.GZIPOutputStream; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.util.TemporaryBuffer; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/SmartServiceInfoRefs.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/SmartServiceInfoRefs.java index d2d6015379..aa04431285 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/SmartServiceInfoRefs.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/SmartServiceInfoRefs.java @@ -10,8 +10,8 @@ package org.eclipse.jgit.http.server; -import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN; -import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; +import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; +import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; import static org.eclipse.jgit.http.server.GitSmartHttpTools.infoRefsResultType; import static org.eclipse.jgit.http.server.GitSmartHttpTools.sendError; import static org.eclipse.jgit.http.server.ServletUtils.ATTRIBUTE_HANDLER; @@ -20,14 +20,14 @@ import static org.eclipse.jgit.http.server.ServletUtils.getRepository; import java.io.IOException; import java.util.List; -import jakarta.servlet.Filter; -import jakarta.servlet.FilterChain; -import jakarta.servlet.FilterConfig; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.transport.PacketLineOut; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/TextFileServlet.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/TextFileServlet.java index b857827339..0b225e769f 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/TextFileServlet.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/TextFileServlet.java @@ -10,7 +10,7 @@ package org.eclipse.jgit.http.server; -import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import static org.eclipse.jgit.http.server.ServletUtils.getRepository; import static org.eclipse.jgit.http.server.ServletUtils.send; @@ -18,9 +18,9 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.util.HttpSupport; import org.eclipse.jgit.util.IO; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackErrorHandler.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackErrorHandler.java index 5159f6cba0..dc92cd1e1d 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackErrorHandler.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackErrorHandler.java @@ -9,14 +9,14 @@ */ package org.eclipse.jgit.http.server; -import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN; -import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static jakarta.servlet.http.HttpServletResponse.SC_OK; +import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; +import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static javax.servlet.http.HttpServletResponse.SC_OK; import java.io.IOException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.errors.PackProtocolException; import org.eclipse.jgit.transport.ServiceMayNotContinueException; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackServlet.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackServlet.java index 3665d35c0e..74419a50d8 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackServlet.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackServlet.java @@ -10,9 +10,9 @@ package org.eclipse.jgit.http.server; -import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN; -import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; -import static jakarta.servlet.http.HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE; +import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; +import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; +import static javax.servlet.http.HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE; import static org.eclipse.jgit.http.server.GitSmartHttpTools.UPLOAD_PACK; import static org.eclipse.jgit.http.server.GitSmartHttpTools.UPLOAD_PACK_REQUEST_TYPE; import static org.eclipse.jgit.http.server.GitSmartHttpTools.UPLOAD_PACK_RESULT_TYPE; @@ -28,15 +28,15 @@ import java.io.IOException; import java.text.MessageFormat; import java.util.List; -import jakarta.servlet.Filter; -import jakarta.servlet.FilterChain; -import jakarta.servlet.FilterConfig; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.errors.PackProtocolException; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ErrorServlet.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ErrorServlet.java index 1852f6c564..822bb79644 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ErrorServlet.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ErrorServlet.java @@ -12,10 +12,10 @@ package org.eclipse.jgit.http.server.glue; import java.io.IOException; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * Send a fixed status code to the client. diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaFilter.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaFilter.java index 98111050f3..7cd1ecf693 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaFilter.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaFilter.java @@ -20,15 +20,15 @@ import java.util.List; import java.util.Set; import java.util.regex.Pattern; -import jakarta.servlet.Filter; -import jakarta.servlet.FilterChain; -import jakarta.servlet.FilterConfig; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.http.server.HttpServerText; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaServlet.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaServlet.java index f577c6950f..9a1a24960f 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaServlet.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaServlet.java @@ -10,18 +10,18 @@ package org.eclipse.jgit.http.server.glue; -import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import java.io.IOException; -import jakarta.servlet.ServletConfig; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * Generic container servlet to manage routing to different pipelines. diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/NoParameterFilterConfig.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/NoParameterFilterConfig.java index 82cf7a8857..3f7ee2a664 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/NoParameterFilterConfig.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/NoParameterFilterConfig.java @@ -13,8 +13,8 @@ package org.eclipse.jgit.http.server.glue; import java.util.Enumeration; import java.util.NoSuchElementException; -import jakarta.servlet.FilterConfig; -import jakarta.servlet.ServletContext; +import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; final class NoParameterFilterConfig implements FilterConfig { private final String filterName; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/RegexGroupFilter.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/RegexGroupFilter.java index 1c540714f6..68adc2d663 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/RegexGroupFilter.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/RegexGroupFilter.java @@ -13,12 +13,12 @@ package org.eclipse.jgit.http.server.glue; import java.io.IOException; import java.text.MessageFormat; -import jakarta.servlet.Filter; -import jakarta.servlet.FilterChain; -import jakarta.servlet.FilterConfig; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import org.eclipse.jgit.http.server.HttpServerText; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/RegexPipeline.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/RegexPipeline.java index 7b856c742c..5baa14a618 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/RegexPipeline.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/RegexPipeline.java @@ -10,18 +10,18 @@ package org.eclipse.jgit.http.server.glue; -import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import static org.eclipse.jgit.http.server.glue.MetaFilter.REGEX_GROUPS; import java.io.IOException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import jakarta.servlet.Filter; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.Filter; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * Selects requests by matching the URI against a regular expression. diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinder.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinder.java index 06993eae97..abd1f714c2 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinder.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinder.java @@ -10,8 +10,8 @@ package org.eclipse.jgit.http.server.glue; -import jakarta.servlet.Filter; -import jakarta.servlet.http.HttpServlet; +import javax.servlet.Filter; +import javax.servlet.http.HttpServlet; /** * Binds a servlet to a URL. diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinderImpl.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinderImpl.java index 814a9003a6..e77de2b187 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinderImpl.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinderImpl.java @@ -13,9 +13,9 @@ package org.eclipse.jgit.http.server.glue; import java.util.ArrayList; import java.util.List; -import jakarta.servlet.Filter; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.Filter; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.http.server.HttpServerText; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/SuffixPipeline.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/SuffixPipeline.java index f2db9c7b3a..39d57b59ec 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/SuffixPipeline.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/SuffixPipeline.java @@ -12,11 +12,11 @@ package org.eclipse.jgit.http.server.glue; import java.io.IOException; -import jakarta.servlet.Filter; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.Filter; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * Selects requests by matching the suffix of the URI. diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/UrlPipeline.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/UrlPipeline.java index a27935f828..7c5170d0f5 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/UrlPipeline.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/UrlPipeline.java @@ -15,16 +15,16 @@ import java.util.Enumeration; import java.util.NoSuchElementException; import java.util.Set; -import jakarta.servlet.Filter; -import jakarta.servlet.FilterChain; -import jakarta.servlet.ServletConfig; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * Encapsulates the entire serving stack for a single URL. diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/WrappedRequest.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/WrappedRequest.java index 5d41791da3..366a91a5b2 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/WrappedRequest.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/WrappedRequest.java @@ -10,8 +10,8 @@ package org.eclipse.jgit.http.server.glue; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletRequestWrapper; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; /** * Overrides the path and path info. diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/AsIsFileService.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/AsIsFileService.java index 69918c0158..f6893c7ca4 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/AsIsFileService.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/AsIsFileService.java @@ -10,7 +10,7 @@ package org.eclipse.jgit.http.server.resolver; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Repository; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/DefaultReceivePackFactory.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/DefaultReceivePackFactory.java index 0bf09f7ede..5415acd0f9 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/DefaultReceivePackFactory.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/DefaultReceivePackFactory.java @@ -10,7 +10,7 @@ package org.eclipse.jgit.http.server.resolver; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.PersonIdent; @@ -27,7 +27,7 @@ import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; * Writing by receive-pack is permitted if any of the following is true: * <ul> * <li>The container has authenticated the user and set - * {@link jakarta.servlet.http.HttpServletRequest#getRemoteUser()} to the + * {@link javax.servlet.http.HttpServletRequest#getRemoteUser()} to the * authenticated name. * <li>The repository configuration file has {@code http.receivepack} explicitly * set to true. diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/DefaultUploadPackFactory.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/DefaultUploadPackFactory.java index 10a1b3e5f2..d01e441bf6 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/DefaultUploadPackFactory.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/DefaultUploadPackFactory.java @@ -12,7 +12,7 @@ package org.eclipse.jgit.http.server.resolver; import java.util.Arrays; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Repository; diff --git a/org.eclipse.jgit.http.test/BUILD b/org.eclipse.jgit.http.test/BUILD index 732b4fae2c..d4870b3ce0 100644 --- a/org.eclipse.jgit.http.test/BUILD +++ b/org.eclipse.jgit.http.test/BUILD @@ -18,6 +18,8 @@ junit_tests( "//lib:jetty-server", "//lib:jetty-servlet", "//lib:jetty-util", + "//lib:jetty-ee8-nested", + "//lib:jetty-ee8-security", "//lib:junit", "//lib:servlet-api", "//lib:slf4j-api", diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 49ab1caadb..af520db1ff 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -9,8 +9,8 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)", org.hamcrest.library;bundle-version="[1.3.0,2.0.0)" -Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", - jakarta.servlet.http;version="[6.0.0,7.0.0)", +Import-Package: javax.servlet;version="[4.0.0,5.0.0)", + javax.servlet.http;version="[4.0.0,5.0.0)", net.bytebuddy.agent;version="[1.9.0,2.0.0)", net.bytebuddy.dynamic.loading;version="[1.9.0,2.0.0)", org.apache.commons.codec;version="[1.6.0,2.0.0)", @@ -18,7 +18,8 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.apache.http;version="[4.3.0,5.0.0)", org.apache.http.client;version="[4.4.0,5.0.0)", org.apache.http.message;version="[4.3.0,5.0.0)", - org.eclipse.jetty.ee10.servlet;version="[12.0.0,13.0.0)", + org.eclipse.jetty.ee8.nested;version="[12.0.0,13.0.0)", + org.eclipse.jetty.ee8.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)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 9500978896..83493ede54 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -82,8 +82,8 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty.ee10</groupId> - <artifactId>jetty-ee10-servlet</artifactId> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-servlet</artifactId> </dependency> </dependencies> diff --git a/org.eclipse.jgit.http.test/src/org/eclipse/jgit/http/test/TestRepositoryResolver.java b/org.eclipse.jgit.http.test/src/org/eclipse/jgit/http/test/TestRepositoryResolver.java index d3a85d1a15..82168d1c5a 100644 --- a/org.eclipse.jgit.http.test/src/org/eclipse/jgit/http/test/TestRepositoryResolver.java +++ b/org.eclipse.jgit.http.test/src/org/eclipse/jgit/http/test/TestRepositoryResolver.java @@ -9,7 +9,7 @@ */ package org.eclipse.jgit.http.test; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.junit.TestRepository; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/AdvertiseErrorTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/AdvertiseErrorTest.java index fd78ba888c..a3b7e627da 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/AdvertiseErrorTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/AdvertiseErrorTest.java @@ -15,10 +15,10 @@ import static org.junit.Assert.fail; import java.util.Collections; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.eclipse.jgit.errors.RemoteRepositoryException; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.http.server.GitServlet; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/AsIsServiceTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/AsIsServiceTest.java index f5db80ba3d..031072be6a 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/AsIsServiceTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/AsIsServiceTest.java @@ -24,8 +24,8 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletRequestWrapper; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; public class AsIsServiceTest extends LocalDiskRepositoryTestCase { private Repository db; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DefaultReceivePackFactoryTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DefaultReceivePackFactoryTest.java index 62979129fc..b0f7702629 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DefaultReceivePackFactoryTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DefaultReceivePackFactoryTest.java @@ -30,8 +30,8 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletRequestWrapper; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; public class DefaultReceivePackFactoryTest extends LocalDiskRepositoryTestCase { private Repository db; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DefaultUploadPackFactoryTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DefaultUploadPackFactoryTest.java index 90188be2c6..13233fad68 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DefaultUploadPackFactoryTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DefaultUploadPackFactoryTest.java @@ -28,8 +28,8 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletRequestWrapper; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; public class DefaultUploadPackFactoryTest extends LocalDiskRepositoryTestCase { private Repository db; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientDumbServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientDumbServerTest.java index 7ccc0e5d9a..7fd477b3ab 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientDumbServerTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientDumbServerTest.java @@ -25,9 +25,9 @@ import java.net.URI; import java.util.List; import java.util.Map; -import org.eclipse.jetty.ee10.servlet.DefaultServlet; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.DefaultServlet; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.eclipse.jgit.errors.NotSupportedException; import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.junit.http.AccessEvent; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java index 9b9f6843de..5021bab079 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java @@ -25,8 +25,8 @@ import java.io.IOException; import java.util.List; import java.util.Map; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.eclipse.jgit.errors.NotSupportedException; import org.eclipse.jgit.http.server.GitServlet; import org.eclipse.jgit.junit.TestRepository; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ErrorServletTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ErrorServletTest.java index 9a610c6b73..4f6894cd66 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ErrorServletTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ErrorServletTest.java @@ -15,8 +15,8 @@ import static org.junit.Assert.assertEquals; import java.net.HttpURLConnection; import java.net.URI; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.eclipse.jgit.http.server.glue.ErrorServlet; import org.eclipse.jgit.junit.http.AppServer; import org.junit.After; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletInitTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletInitTest.java index c8873606f3..ec02e7ec31 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletInitTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletInitTest.java @@ -13,8 +13,8 @@ package org.eclipse.jgit.http.test; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.eclipse.jgit.http.server.GitServlet; import org.eclipse.jgit.junit.http.AppServer; import org.eclipse.jgit.junit.http.MockServletConfig; @@ -22,7 +22,7 @@ import org.eclipse.jgit.junit.http.RecordingLogger; import org.junit.After; import org.junit.Test; -import jakarta.servlet.ServletException; +import javax.servlet.ServletException; public class GitServletInitTest { private AppServer server; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletResponseTests.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletResponseTests.java index 9331efa603..d6156ca50e 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletResponseTests.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletResponseTests.java @@ -15,10 +15,10 @@ import static org.junit.Assert.fail; import java.util.Collection; import java.util.Collections; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.eclipse.jgit.errors.CorruptObjectException; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.errors.TooLargePackException; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HookMessageTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HookMessageTest.java index 082d853f42..20f5a546c8 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HookMessageTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HookMessageTest.java @@ -20,10 +20,10 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.http.server.GitServlet; import org.eclipse.jgit.http.server.resolver.DefaultReceivePackFactory; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java index 3937627f53..fbc32ffc1d 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java @@ -28,11 +28,11 @@ import java.time.Instant; import java.util.List; import java.util.Set; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; -import org.eclipse.jetty.ee10.servlet.DefaultServlet; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.DefaultServlet; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.errors.NoRemoteRepositoryException; import org.eclipse.jgit.errors.RepositoryNotFoundException; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/MeasurePackSizeTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/MeasurePackSizeTest.java index 183043b2d4..7a3b9b5454 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/MeasurePackSizeTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/MeasurePackSizeTest.java @@ -14,10 +14,10 @@ import static org.junit.Assert.assertEquals; import java.util.Collection; import java.util.Collections; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.http.server.GitServlet; import org.eclipse.jgit.http.server.resolver.DefaultReceivePackFactory; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ProtocolErrorTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ProtocolErrorTest.java index 74028d762d..b7b9c68382 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ProtocolErrorTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ProtocolErrorTest.java @@ -20,10 +20,10 @@ import java.io.OutputStream; import java.net.HttpURLConnection; import java.net.URL; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.http.server.GitServlet; import org.eclipse.jgit.http.server.GitSmartHttpTools; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/RegexPipelineTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/RegexPipelineTest.java index dfdb975ef6..9886f6b5d4 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/RegexPipelineTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/RegexPipelineTest.java @@ -55,12 +55,12 @@ import java.io.PrintWriter; import java.net.HttpURLConnection; import java.net.URI; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.eclipse.jgit.http.server.glue.MetaServlet; import org.eclipse.jgit.http.server.glue.RegexGroupFilter; import org.eclipse.jgit.junit.http.AppServer; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SetAdditionalHeadersTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SetAdditionalHeadersTest.java index d569431684..6a96569d4d 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SetAdditionalHeadersTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SetAdditionalHeadersTest.java @@ -20,9 +20,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.jetty.ee10.servlet.DefaultServlet; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.DefaultServlet; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.junit.http.AccessEvent; import org.eclipse.jgit.lib.Repository; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerSslTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerSslTest.java index 13ed36cb8c..3af909262b 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerSslTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerSslTest.java @@ -19,19 +19,19 @@ import java.io.IOException; import java.util.EnumSet; import java.util.List; -import jakarta.servlet.DispatcherType; -import jakarta.servlet.Filter; -import jakarta.servlet.FilterChain; -import jakarta.servlet.FilterConfig; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -import org.eclipse.jetty.ee10.servlet.FilterHolder; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import javax.servlet.DispatcherType; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.eclipse.jetty.ee8.servlet.FilterHolder; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.eclipse.jgit.errors.TransportException; import org.eclipse.jgit.errors.UnsupportedCredentialItem; import org.eclipse.jgit.http.server.GitServlet; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java index b0d17adb3a..5edcea87f8 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java @@ -41,20 +41,20 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import jakarta.servlet.DispatcherType; -import jakarta.servlet.Filter; -import jakarta.servlet.FilterChain; -import jakarta.servlet.FilterConfig; -import jakarta.servlet.RequestDispatcher; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -import org.eclipse.jetty.ee10.servlet.FilterHolder; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import javax.servlet.DispatcherType; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.eclipse.jetty.ee8.servlet.FilterHolder; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.TransportConfigCallback; import org.eclipse.jgit.errors.NoRemoteRepositoryException; diff --git a/org.eclipse.jgit.junit.http/.settings/.api_filters b/org.eclipse.jgit.junit.http/.settings/.api_filters new file mode 100644 index 0000000000..e756a79192 --- /dev/null +++ b/org.eclipse.jgit.junit.http/.settings/.api_filters @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.jgit.junit.http" version="2"> + <resource path="src/org/eclipse/jgit/junit/http/AppServer.java" type="org.eclipse.jgit.junit.http.AppServer"> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.junit.http.AppServer"/> + <message_argument value="addContext(String)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.junit.http.AppServer"/> + <message_argument value="authBasic(ServletContextHandler, String[])"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="addContext(String)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="authBasic(ServletContextHandler, String[])"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/junit/http/HttpTestCase.java" type="org.eclipse.jgit.junit.http.HttpTestCase"> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.junit.http.HttpTestCase"/> + <message_argument value="toURIish(ServletContextHandler, String)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="toURIish(ServletContextHandler, String)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/junit/http/MockServletConfig.java" type="org.eclipse.jgit.junit.http.MockServletConfig"> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.junit.http.MockServletConfig"/> + <message_argument value="getServletContext()"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/org.eclipse.jgit.junit.http/BUILD b/org.eclipse.jgit.junit.http/BUILD index 66620cea51..1b346804ab 100644 --- a/org.eclipse.jgit.junit.http/BUILD +++ b/org.eclipse.jgit.junit.http/BUILD @@ -16,6 +16,8 @@ java_library( "//lib:jetty-servlet", "//lib:jetty-session", "//lib:jetty-util", + "//lib:jetty-ee8-nested", + "//lib:jetty-ee8-security", "//lib:junit", "//lib:servlet-api", "//lib:slf4j-api", diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 7a5a02640d..8afef30c62 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -8,16 +8,19 @@ Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", - jakarta.servlet.http;version="[6.0.0,7.0.0)", +Import-Package: javax.servlet;version="[4.0.0,5.0.0)", + javax.servlet.http;version="[4.0.0,5.0.0)", org.apache.commons.logging;version="[1.1.1,2.0.0)", - org.eclipse.jetty.ee10.servlet;version="[12.0.0,13.0.0)", - org.eclipse.jetty.ee10.servlet.security;version="[12.0.0,13.0.0)", + org.eclipse.jetty.ee8.nested;version="[12.0.0,13.0.0)", + org.eclipse.jetty.ee8.security;version="[12.0.0,13.0.0)", + org.eclipse.jetty.ee8.security.authentication;version="[12.0.0,13.0.0)", + org.eclipse.jetty.ee8.servlet;version="[12.0.0,13.0.0)", org.eclipse.jetty.http;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.server;version="[12.0.0,13.0.0)", org.eclipse.jetty.server.handler;version="[12.0.0,13.0.0)", + org.eclipse.jetty.session;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)", @@ -34,8 +37,8 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.slf4j.helpers;version="[1.7.0,3.0.0)" Export-Package: org.eclipse.jgit.junit.http;version="7.4.0"; uses:="org.eclipse.jgit.transport, - jakarta.servlet, - jakarta.servlet.http, + javax.servlet, + javax.servlet.http, org.eclipse.jgit.junit, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 9f405f350c..4597ee5076 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -58,8 +58,8 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty.ee10</groupId> - <artifactId>jetty-ee10-servlet</artifactId> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-servlet</artifactId> </dependency> <dependency> diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java index 76e437bc3d..1e4c7966b6 100644 --- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java @@ -27,15 +27,15 @@ import java.util.Locale; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.security.ConstraintMapping; -import org.eclipse.jetty.ee10.servlet.security.ConstraintSecurityHandler; +import org.eclipse.jetty.ee8.nested.ServletConstraint; +import org.eclipse.jetty.ee8.security.Authenticator; +import org.eclipse.jetty.ee8.security.ConstraintMapping; +import org.eclipse.jetty.ee8.security.ConstraintSecurityHandler; +import org.eclipse.jetty.ee8.security.authentication.BasicAuthenticator; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; import org.eclipse.jetty.security.AbstractLoginService; -import org.eclipse.jetty.security.Authenticator; -import org.eclipse.jetty.security.Constraint; import org.eclipse.jetty.security.RolePrincipal; import org.eclipse.jetty.security.UserPrincipal; -import org.eclipse.jetty.security.authentication.BasicAuthenticator; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; @@ -307,11 +307,10 @@ public class AppServer { private ConstraintMapping createConstraintMapping() { ConstraintMapping cm = new ConstraintMapping(); - Constraint constraint = new Constraint.Builder() - .authorization(Constraint.Authorization.SPECIFIC_ROLE) - .roles(new String[] { authRole }).build(); - cm.setConstraint(constraint); - cm.setPathSpec("/*"); + cm.setConstraint(new ServletConstraint()); + cm.getConstraint().setAuthenticate(true); + cm.getConstraint().setDataConstraint(ServletConstraint.DC_NONE); + cm.getConstraint().setRoles(new String[] { authRole }); return cm; } @@ -320,11 +319,14 @@ public class AppServer { AbstractLoginService users = new TestMappedLoginService(authRole); List<ConstraintMapping> mappings = new ArrayList<>(); if (methods == null || methods.length == 0) { - mappings.add(createConstraintMapping()); + ConstraintMapping cm = createConstraintMapping(); + cm.setPathSpec("/*"); + mappings.add(cm); } else { for (String method : methods) { ConstraintMapping cm = createConstraintMapping(); cm.setMethod(method.toUpperCase(Locale.ROOT)); + cm.setPathSpec("/*"); mappings.add(cm); } } @@ -333,12 +335,8 @@ public class AppServer { sec.setRealmName(realm); sec.setAuthenticator(authType); sec.setLoginService(users); - sec.setConstraintMappings( - mappings.toArray(new ConstraintMapping[0])); - sec.setHandler(ctx); - - contexts.removeHandler(ctx); - contexts.addHandler(sec); + sec.setConstraintMappings(mappings.toArray(new ConstraintMapping[0])); + ctx.setSecurityHandler(sec); } /** diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/HttpTestCase.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/HttpTestCase.java index f399471b39..ccf0311e11 100644 --- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/HttpTestCase.java +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/HttpTestCase.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; import org.eclipse.jgit.internal.storage.file.FileRepository; import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase; import org.eclipse.jgit.junit.TestRepository; diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/MockServletConfig.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/MockServletConfig.java index 808b076943..cd1eba4bfd 100644 --- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/MockServletConfig.java +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/MockServletConfig.java @@ -15,8 +15,8 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import jakarta.servlet.ServletConfig; -import jakarta.servlet.ServletContext; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; /** * Mock ServletConfig diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/SimpleHttpServer.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/SimpleHttpServer.java index bce41383d1..d825b3735d 100644 --- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/SimpleHttpServer.java +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/SimpleHttpServer.java @@ -13,10 +13,10 @@ package org.eclipse.jgit.junit.http; import java.net.URI; import java.net.URISyntaxException; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.http.server.GitServlet; import org.eclipse.jgit.lib.Repository; diff --git a/org.eclipse.jgit.junit/.settings/.api_filters b/org.eclipse.jgit.junit/.settings/.api_filters deleted file mode 100644 index 27815301c2..0000000000 --- a/org.eclipse.jgit.junit/.settings/.api_filters +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<component id="org.eclipse.jgit.junit" version="2"> - <resource path="src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java" type="org.eclipse.jgit.junit.LocalDiskRepositoryTestCase"> - <filter id="336658481"> - <message_arguments> - <message_argument value="org.eclipse.jgit.junit.LocalDiskRepositoryTestCase"/> - <message_argument value="testRoot"/> - </message_arguments> - </filter> - </resource> -</component> 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 414cec87ed..264bd52870 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -7,14 +7,14 @@ Bundle-Version: 7.4.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", - jakarta.servlet.http;version="[6.0.0,7.0.0)", +Import-Package: javax.servlet;version="[4.0.0,5.0.0)", + javax.servlet.http;version="[4.0.0,5.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.ee10.servlet;version="[12.0.0,13.0.0)", + org.eclipse.jetty.ee8.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)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 5c4b27f857..3c57f75129 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.ee10</groupId> - <artifactId>jetty-ee10-servlet</artifactId> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-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 9a49023fcb..9e43e0d601 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.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.eclipse.jgit.junit.MockSystemReader; import org.eclipse.jgit.junit.http.AppServer; import org.eclipse.jgit.lfs.errors.LfsException; diff --git a/org.eclipse.jgit.lfs.server/.settings/.api_filters b/org.eclipse.jgit.lfs.server/.settings/.api_filters new file mode 100644 index 0000000000..46106ee4bf --- /dev/null +++ b/org.eclipse.jgit.lfs.server/.settings/.api_filters @@ -0,0 +1,115 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.jgit.lfs.server" version="2"> + <resource path="src/org/eclipse/jgit/lfs/server/LfsProtocolServlet.java" type="org.eclipse.jgit.lfs.server.LfsProtocolServlet"> + <filter id="337682486"> + <message_arguments> + <message_argument value="org.eclipse.jgit.lfs.server.LfsProtocolServlet"/> + <message_argument value="jakarta.servlet.ServletConfig,jakarta.servlet.Servlet"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.lfs.server.LfsProtocolServlet"/> + <message_argument value="doPost(HttpServletRequest, HttpServletResponse)"/> + </message_arguments> + </filter> + <filter id="338849923"> + <message_arguments> + <message_argument value="org.eclipse.jgit.lfs.server.LfsProtocolServlet"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/lfs/server/fs/FileLfsServlet.java" type="org.eclipse.jgit.lfs.server.fs.FileLfsServlet"> + <filter id="337682486"> + <message_arguments> + <message_argument value="org.eclipse.jgit.lfs.server.fs.FileLfsServlet"/> + <message_argument value="jakarta.servlet.ServletConfig,jakarta.servlet.Servlet"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.lfs.server.fs.FileLfsServlet"/> + <message_argument value="doGet(HttpServletRequest, HttpServletResponse)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.lfs.server.fs.FileLfsServlet"/> + <message_argument value="doPut(HttpServletRequest, HttpServletResponse)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.lfs.server.fs.FileLfsServlet"/> + <message_argument value="getObjectToTransfer(HttpServletRequest, HttpServletResponse)"/> + </message_arguments> + </filter> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.lfs.server.fs.FileLfsServlet"/> + <message_argument value="sendError(HttpServletResponse, int, String)"/> + </message_arguments> + </filter> + <filter id="338849923"> + <message_arguments> + <message_argument value="org.eclipse.jgit.lfs.server.fs.FileLfsServlet"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="getObjectToTransfer(HttpServletRequest, HttpServletResponse)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="sendError(HttpServletResponse, int, String)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java" type="org.eclipse.jgit.lfs.server.fs.ObjectDownloadListener"> + <filter id="337682486"> + <message_arguments> + <message_argument value="org.eclipse.jgit.lfs.server.fs.ObjectDownloadListener"/> + <message_argument value="jakarta.servlet.WriteListener"/> + </message_arguments> + </filter> + <filter id="338722907"> + <message_arguments> + <message_argument value="org.eclipse.jgit.lfs.server.fs.ObjectDownloadListener"/> + <message_argument value="ObjectDownloadListener(FileLfsRepository, AsyncContext, HttpServletResponse, AnyLongObjectId)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="ObjectDownloadListener(FileLfsRepository, AsyncContext, HttpServletResponse, AnyLongObjectId)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java" type="org.eclipse.jgit.lfs.server.fs.ObjectUploadListener"> + <filter id="337682486"> + <message_arguments> + <message_argument value="org.eclipse.jgit.lfs.server.fs.ObjectUploadListener"/> + <message_argument value="jakarta.servlet.ReadListener"/> + </message_arguments> + </filter> + <filter id="338722907"> + <message_arguments> + <message_argument value="org.eclipse.jgit.lfs.server.fs.ObjectUploadListener"/> + <message_argument value="ObjectUploadListener(FileLfsRepository, AsyncContext, HttpServletRequest, HttpServletResponse, AnyLongObjectId)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="7.3"/> + <message_argument value="ObjectUploadListener(FileLfsRepository, AsyncContext, HttpServletRequest, HttpServletResponse, AnyLongObjectId)"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 019c6ec849..fdf462297c 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -7,11 +7,11 @@ Bundle-Version: 7.4.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.4.0"; - uses:="jakarta.servlet.http, + uses:="javax.servlet.http, org.eclipse.jgit.lfs.lib", org.eclipse.jgit.lfs.server.fs;version="7.4.0"; - uses:="jakarta.servlet, - jakarta.servlet.http, + uses:="javax.servlet, + javax.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", org.eclipse.jgit.lfs.server.internal;version="7.4.0";x-internal:=true, @@ -20,9 +20,9 @@ Export-Package: org.eclipse.jgit.lfs.server;version="7.4.0"; org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: com.google.gson;version="[2.8.0,3.0.0)", - jakarta.servlet;version="[6.0.0,7.0.0)", - jakarta.servlet.annotation;version="[6.0.0,7.0.0)", - jakarta.servlet.http;version="[6.0.0,7.0.0)", + javax.servlet;version="[4.0.0,5.0.0)", + javax.servlet.annotation;version="[4.0.0,5.0.0)", + javax.servlet.http;version="[4.0.0,5.0.0)", org.apache.http;version="[4.3.0,5.0.0)", org.eclipse.jgit.annotations;version="[7.4.0,7.5.0)", org.eclipse.jgit.internal;version="[7.4.0,7.5.0)", diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LfsProtocolServlet.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LfsProtocolServlet.java index 1d245a0a99..84bab5b9fc 100644 --- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LfsProtocolServlet.java +++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LfsProtocolServlet.java @@ -33,10 +33,10 @@ import java.io.Writer; import java.text.MessageFormat; import java.util.List; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.lfs.errors.LfsBandwidthLimitExceeded; import org.eclipse.jgit.lfs.errors.LfsException; diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/TransferHandler.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/TransferHandler.java index 4662830689..b84228b9e2 100644 --- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/TransferHandler.java +++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/TransferHandler.java @@ -10,7 +10,7 @@ package org.eclipse.jgit.lfs.server; -import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import static org.eclipse.jgit.lfs.lib.Constants.DOWNLOAD; import static org.eclipse.jgit.lfs.lib.Constants.UPLOAD; import static org.eclipse.jgit.lfs.lib.Constants.VERIFY; diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/FileLfsServlet.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/FileLfsServlet.java index e95122da59..0102a9069c 100644 --- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/FileLfsServlet.java +++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/FileLfsServlet.java @@ -13,12 +13,12 @@ import java.io.IOException; import java.io.PrintWriter; import java.text.MessageFormat; -import jakarta.servlet.AsyncContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.AsyncContext; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.apache.http.HttpStatus; import org.eclipse.jgit.lfs.errors.InvalidLongObjectIdException; diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java index c826aa66eb..223ec8c697 100644 --- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java +++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java @@ -17,10 +17,10 @@ import java.nio.channels.WritableByteChannel; import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.servlet.AsyncContext; -import jakarta.servlet.ServletOutputStream; -import jakarta.servlet.WriteListener; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.AsyncContext; +import javax.servlet.ServletOutputStream; +import javax.servlet.WriteListener; +import javax.servlet.http.HttpServletResponse; import org.apache.http.HttpStatus; import org.eclipse.jgit.lfs.lib.AnyLongObjectId; diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java index d0c07fb25a..270c380995 100644 --- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java +++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java @@ -19,11 +19,11 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.servlet.AsyncContext; -import jakarta.servlet.ReadListener; -import jakarta.servlet.ServletInputStream; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.AsyncContext; +import javax.servlet.ReadListener; +import javax.servlet.ServletInputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.apache.http.HttpStatus; import org.eclipse.jgit.lfs.errors.CorruptLongObjectException; @@ -84,11 +84,11 @@ public class ObjectUploadListener implements ReadListener { * @param repository * the repository storing large objects * @param context - * a {@link jakarta.servlet.AsyncContext} object. + * a {@link javax.servlet.AsyncContext} object. * @param request - * a {@link jakarta.servlet.http.HttpServletRequest} object. + * a {@link javax.servlet.http.HttpServletRequest} object. * @param response - * a {@link jakarta.servlet.http.HttpServletResponse} object. + * a {@link javax.servlet.http.HttpServletResponse} object. * @param id * a {@link org.eclipse.jgit.lfs.lib.AnyLongObjectId} object. * @throws java.io.FileNotFoundException diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/s3/S3Repository.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/s3/S3Repository.java index 01ddc95310..5ebce5d8c0 100644 --- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/s3/S3Repository.java +++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/s3/S3Repository.java @@ -10,7 +10,7 @@ */ package org.eclipse.jgit.lfs.server.s3; -import static jakarta.servlet.http.HttpServletResponse.SC_OK; +import static javax.servlet.http.HttpServletResponse.SC_OK; import static org.eclipse.jgit.lfs.server.s3.SignerV4.UNSIGNED_PAYLOAD; import static org.eclipse.jgit.lfs.server.s3.SignerV4.X_AMZ_CONTENT_SHA256; import static org.eclipse.jgit.lfs.server.s3.SignerV4.X_AMZ_EXPIRES; diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml index eef699cfa1..24cdcf8a72 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml @@ -105,10 +105,10 @@ <bundle id="org.eclipse.jetty.server.source"> <category name="JGit-dependency-bundles"/> </bundle> - <bundle id="org.eclipse.jetty.ee10.servlet"> + <bundle id="org.eclipse.jetty.ee8.servlet"> <category name="JGit-dependency-bundles"/> </bundle> - <bundle id="org.eclipse.jetty.ee10.servlet.source"> + <bundle id="org.eclipse.jetty.ee8.servlet.source"> <category name="JGit-dependency-bundles"/> </bundle> <bundle id="org.eclipse.jetty.util"> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index f98b044bd6..c000e25844 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.32" sequenceNumber="1751623995"> +<target name="jgit-4.32" sequenceNumber="1752056250"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -101,8 +101,20 @@ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> <dependencies> <dependency> - <groupId>org.eclipse.jetty.ee10</groupId> - <artifactId>jetty-ee10-servlet</artifactId> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-servlet</artifactId> + <version>12.0.23</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-nested</artifactId> + <version>12.0.23</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-security</artifactId> <version>12.0.23</version> <type>jar</type> </dependency> @@ -151,7 +163,7 @@ <dependency> <groupId>jakarta.servlet</groupId> <artifactId>jakarta.servlet-api</artifactId> - <version>6.1.0</version> + <version>4.0.4</version> <type>jar</type> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 871972294b..a37bd14a2b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.33" sequenceNumber="1751623995"> +<target name="jgit-4.33" sequenceNumber="1752056251"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -101,8 +101,20 @@ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> <dependencies> <dependency> - <groupId>org.eclipse.jetty.ee10</groupId> - <artifactId>jetty-ee10-servlet</artifactId> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-servlet</artifactId> + <version>12.0.23</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-nested</artifactId> + <version>12.0.23</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-security</artifactId> <version>12.0.23</version> <type>jar</type> </dependency> @@ -151,7 +163,7 @@ <dependency> <groupId>jakarta.servlet</groupId> <artifactId>jakarta.servlet-api</artifactId> - <version>6.1.0</version> + <version>4.0.4</version> <type>jar</type> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index a8f51b2274..95531a7759 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.34" sequenceNumber="1751623995"> +<target name="jgit-4.34" sequenceNumber="1752056250"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -101,8 +101,20 @@ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> <dependencies> <dependency> - <groupId>org.eclipse.jetty.ee10</groupId> - <artifactId>jetty-ee10-servlet</artifactId> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-servlet</artifactId> + <version>12.0.23</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-nested</artifactId> + <version>12.0.23</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-security</artifactId> <version>12.0.23</version> <type>jar</type> </dependency> @@ -151,7 +163,7 @@ <dependency> <groupId>jakarta.servlet</groupId> <artifactId>jakarta.servlet-api</artifactId> - <version>6.1.0</version> + <version>4.0.4</version> <type>jar</type> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 352b4062b3..3a17d7e26c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.35" sequenceNumber="1751623995"> +<target name="jgit-4.35" sequenceNumber="1752056250"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -101,8 +101,20 @@ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> <dependencies> <dependency> - <groupId>org.eclipse.jetty.ee10</groupId> - <artifactId>jetty-ee10-servlet</artifactId> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-servlet</artifactId> + <version>12.0.23</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-nested</artifactId> + <version>12.0.23</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-security</artifactId> <version>12.0.23</version> <type>jar</type> </dependency> @@ -151,7 +163,7 @@ <dependency> <groupId>jakarta.servlet</groupId> <artifactId>jakarta.servlet-api</artifactId> - <version>6.1.0</version> + <version>4.0.4</version> <type>jar</type> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index 37e7c04228..2d7aaf930c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.36" sequenceNumber="1751623995"> +<target name="jgit-4.36" sequenceNumber="1752056250"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -101,8 +101,20 @@ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> <dependencies> <dependency> - <groupId>org.eclipse.jetty.ee10</groupId> - <artifactId>jetty-ee10-servlet</artifactId> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-servlet</artifactId> + <version>12.0.23</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-nested</artifactId> + <version>12.0.23</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-security</artifactId> <version>12.0.23</version> <type>jar</type> </dependency> @@ -151,7 +163,7 @@ <dependency> <groupId>jakarta.servlet</groupId> <artifactId>jakarta.servlet-api</artifactId> - <version>6.1.0</version> + <version>4.0.4</version> <type>jar</type> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 5c6833eee1..de22e9506a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -152,8 +152,18 @@ maven jetty includeSources { dependency { - groupId = "org.eclipse.jetty.ee10" - artifactId = "jetty-ee10-servlet" + groupId = "org.eclipse.jetty.ee8" + artifactId = "jetty-ee8-servlet" + version = "12.0.23" + } + dependency { + groupId = "org.eclipse.jetty.ee8" + artifactId = "jetty-ee8-nested" + version = "12.0.23" + } + dependency { + groupId = "org.eclipse.jetty.ee8" + artifactId = "jetty-ee8-security" version = "12.0.23" } dependency { @@ -194,7 +204,7 @@ maven jetty dependency { groupId = "jakarta.servlet" artifactId = "jakarta.servlet-api" - version = "6.1.0" + version = "4.0.4" } } diff --git a/org.eclipse.jgit.pgm/BUILD b/org.eclipse.jgit.pgm/BUILD index a267b155ac..5686ffb517 100644 --- a/org.eclipse.jgit.pgm/BUILD +++ b/org.eclipse.jgit.pgm/BUILD @@ -22,6 +22,8 @@ java_library( "//lib:jetty-server", "//lib:jetty-servlet", "//lib:jetty-util", + "//lib:jetty-ee8-nested", + "//lib:jetty-ee8-security", "//lib:servlet-api", "//org.eclipse.jgit.archive:jgit-archive", "//org.eclipse.jgit.http.apache:http-apache", diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 21198afc65..81f49a50b7 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -7,9 +7,10 @@ Bundle-Version: 7.4.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", +Import-Package: javax.servlet;version="[4.0.0,5.0.0)", org.apache.commons.logging;version="[1.2,2.0)", - org.eclipse.jetty.ee10.servlet;version="[12.0.0,13.0.0)", + org.eclipse.jetty.ee8.nested;version="[12.0.0,13.0.0)", + org.eclipse.jetty.ee8.servlet;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)", diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 14588dd6df..2e0ac05772 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -107,8 +107,8 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty.ee10</groupId> - <artifactId>jetty-ee10-servlet</artifactId> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-servlet</artifactId> </dependency> <dependency> diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/LfsStore.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/LfsStore.java index 757c435722..ac06650643 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/LfsStore.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/LfsStore.java @@ -26,8 +26,8 @@ import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.handler.ContextHandlerCollection; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.lfs.server.LargeFileRepository; import org.eclipse.jgit.lfs.server.LfsProtocolServlet; diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters deleted file mode 100644 index 877a488a73..0000000000 --- a/org.eclipse.jgit/.settings/.api_filters +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<component id="org.eclipse.jgit" version="2"> - <resource path="src/org/eclipse/jgit/lib/RefDatabase.java" type="org.eclipse.jgit.lib.RefDatabase"> - <filter id="336695337"> - <message_arguments> - <message_argument value="org.eclipse.jgit.lib.RefDatabase"/> - <message_argument value="getReflogReader(Ref)"/> - </message_arguments> - </filter> - <filter id="336695337"> - <message_arguments> - <message_argument value="org.eclipse.jgit.lib.RefDatabase"/> - <message_argument value="getReflogReader(String)"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/jgit/lib/TypedConfigGetter.java" type="org.eclipse.jgit.lib.TypedConfigGetter"> - <filter id="403804204"> - <message_arguments> - <message_argument value="org.eclipse.jgit.lib.TypedConfigGetter"/> - <message_argument value="getBoolean(Config, String, String, String, Boolean)"/> - </message_arguments> - </filter> - <filter id="403804204"> - <message_arguments> - <message_argument value="org.eclipse.jgit.lib.TypedConfigGetter"/> - <message_argument value="getInt(Config, String, String, String, Integer)"/> - </message_arguments> - </filter> - <filter id="403804204"> - <message_arguments> - <message_argument value="org.eclipse.jgit.lib.TypedConfigGetter"/> - <message_argument value="getIntInRange(Config, String, String, String, Integer, Integer, Integer)"/> - </message_arguments> - </filter> - <filter id="403804204"> - <message_arguments> - <message_argument value="org.eclipse.jgit.lib.TypedConfigGetter"/> - <message_argument value="getIntInRange(Config, String, String, String, int, int, Integer)"/> - </message_arguments> - </filter> - <filter id="403804204"> - <message_arguments> - <message_argument value="org.eclipse.jgit.lib.TypedConfigGetter"/> - <message_argument value="getLong(Config, String, String, String, Long)"/> - </message_arguments> - </filter> - <filter id="403804204"> - <message_arguments> - <message_argument value="org.eclipse.jgit.lib.TypedConfigGetter"/> - <message_argument value="getTimeUnit(Config, String, String, String, Long, TimeUnit)"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/jgit/revwalk/RevWalk.java" type="org.eclipse.jgit.revwalk.RevWalk"> - <filter id="1142947843"> - <message_arguments> - <message_argument value="6.10.1"/> - <message_argument value="isMergedIntoAnyCommit(RevCommit, Collection<RevCommit>)"/> - </message_arguments> - </filter> - </resource> -</component> diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 6b25c7e6f0..c5fc215bec 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -110,7 +110,9 @@ Export-Package: org.eclipse.jgit.annotations;version="7.4.0", org.eclipse.jgit.pgm", org.eclipse.jgit.internal.storage.memory;version="7.4.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.midx;version="7.4.0";x-internal:=true, + org.eclipse.jgit.internal.storage.midx;version="7.4.0"; + x-friends:="org.eclipse.jgit.pgm, + org.eclipse.jgit.test", org.eclipse.jgit.internal.storage.pack;version="7.4.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, @@ -129,7 +129,7 @@ <args4j-version>2.37</args4j-version> <commons-compress-version>1.27.1</commons-compress-version> <osgi-core-version>6.0.0</osgi-core-version> - <servlet-api-version>6.1.0</servlet-api-version> + <servlet-api-version>4.0.4</servlet-api-version> <jetty-version>12.0.23</jetty-version> <japicmp-version>0.23.1</japicmp-version> <httpclient-version>4.5.14</httpclient-version> @@ -928,8 +928,8 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty.ee10</groupId> - <artifactId>jetty-ee10-servlet</artifactId> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-servlet</artifactId> <version>${jetty-version}</version> </dependency> |