This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 01af13171b FELIX-6588 : Update to final OSGi R8.1 Servlet Service
01af13171b is described below
commit 01af13171b84f13a93e6fa8ed5310f4e73ea8385
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Thu Dec 22 11:18:10 2022 +0100
FELIX-6588 : Update to final OSGi R8.1 Servlet Service
---
http/proxy/pom.xml | 18 +++-------
.../felix/http/proxy/AbstractProxyListener.java | 14 ++++----
.../felix/http/proxy/AbstractProxyServlet.java | 38 +++++++++++-----------
.../apache/felix/http/proxy/DispatcherTracker.java | 4 +--
.../org/apache/felix/http/proxy/ProxyListener.java | 16 ++++-----
.../org/apache/felix/http/proxy/ProxyServlet.java | 2 +-
.../http/proxy/impl/EventDispatcherTracker.java | 6 ++--
.../proxy/impl/ProxyServletContextListener.java | 8 ++---
.../org/apache/felix/http/proxy/package-info.java | 2 +-
9 files changed, 49 insertions(+), 59 deletions(-)
diff --git a/http/proxy/pom.xml b/http/proxy/pom.xml
index 745826dd4a..a283a56e8b 100644
--- a/http/proxy/pom.xml
+++ b/http/proxy/pom.xml
@@ -42,26 +42,16 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Import-Package>
- javax.servlet;version="[3.1,0)",
- javax.servlet.annotation;version="[3.1,0)",
- javax.servlet.descriptor;version="[3.1,0)",
- javax.servlet.http;version="[3.1,0)",
- *
- </Import-Package>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>4.0.1</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>5.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
diff --git
a/http/proxy/src/main/java/org/apache/felix/http/proxy/AbstractProxyListener.java
b/http/proxy/src/main/java/org/apache/felix/http/proxy/AbstractProxyListener.java
index b27fa4ab4c..55da666747 100755
---
a/http/proxy/src/main/java/org/apache/felix/http/proxy/AbstractProxyListener.java
+++
b/http/proxy/src/main/java/org/apache/felix/http/proxy/AbstractProxyListener.java
@@ -18,13 +18,13 @@
*/
package org.apache.felix.http.proxy;
-import javax.servlet.ServletContextAttributeEvent;
-import javax.servlet.ServletContextAttributeListener;
-import javax.servlet.http.HttpSessionAttributeListener;
-import javax.servlet.http.HttpSessionBindingEvent;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionIdListener;
-import javax.servlet.http.HttpSessionListener;
+import jakarta.servlet.ServletContextAttributeEvent;
+import jakarta.servlet.ServletContextAttributeListener;
+import jakarta.servlet.http.HttpSessionAttributeListener;
+import jakarta.servlet.http.HttpSessionBindingEvent;
+import jakarta.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionIdListener;
+import jakarta.servlet.http.HttpSessionListener;
import org.apache.felix.http.proxy.impl.EventDispatcherTracker;
import org.osgi.framework.BundleContext;
diff --git
a/http/proxy/src/main/java/org/apache/felix/http/proxy/AbstractProxyServlet.java
b/http/proxy/src/main/java/org/apache/felix/http/proxy/AbstractProxyServlet.java
index f2315e79af..4440d24190 100755
---
a/http/proxy/src/main/java/org/apache/felix/http/proxy/AbstractProxyServlet.java
+++
b/http/proxy/src/main/java/org/apache/felix/http/proxy/AbstractProxyServlet.java
@@ -25,22 +25,22 @@ import java.util.EventListener;
import java.util.Map;
import java.util.Set;
-import javax.servlet.Filter;
-import javax.servlet.FilterRegistration;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
-import javax.servlet.ServletRegistration.Dynamic;
-import javax.servlet.SessionCookieConfig;
-import javax.servlet.SessionTrackingMode;
-import javax.servlet.descriptor.JspConfigDescriptor;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.ServletRegistration.Dynamic;
+import jakarta.servlet.SessionCookieConfig;
+import jakarta.servlet.SessionTrackingMode;
+import jakarta.servlet.descriptor.JspConfigDescriptor;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.framework.BundleContext;
@@ -353,17 +353,17 @@ public abstract class AbstractProxyServlet
}
@Override
- public javax.servlet.FilterRegistration.Dynamic addFilter(String
filterName, String className) {
+ public jakarta.servlet.FilterRegistration.Dynamic addFilter(String
filterName, String className) {
return delegatee.addFilter(filterName, className);
}
@Override
- public javax.servlet.FilterRegistration.Dynamic addFilter(String
filterName, Filter filter) {
+ public jakarta.servlet.FilterRegistration.Dynamic addFilter(String
filterName, Filter filter) {
return delegatee.addFilter(filterName, filter);
}
@Override
- public javax.servlet.FilterRegistration.Dynamic addFilter(String
filterName,
+ public jakarta.servlet.FilterRegistration.Dynamic addFilter(String
filterName,
Class<? extends Filter> filterClass) {
return delegatee.addFilter(filterName, filterClass);
}
diff --git
a/http/proxy/src/main/java/org/apache/felix/http/proxy/DispatcherTracker.java
b/http/proxy/src/main/java/org/apache/felix/http/proxy/DispatcherTracker.java
index 82ddba32d5..a053678273 100644
---
a/http/proxy/src/main/java/org/apache/felix/http/proxy/DispatcherTracker.java
+++
b/http/proxy/src/main/java/org/apache/felix/http/proxy/DispatcherTracker.java
@@ -16,8 +16,8 @@
*/
package org.apache.felix.http.proxy;
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.http.HttpServlet;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
diff --git
a/http/proxy/src/main/java/org/apache/felix/http/proxy/ProxyListener.java
b/http/proxy/src/main/java/org/apache/felix/http/proxy/ProxyListener.java
index 1a0923b2ed..4107da00d3 100644
--- a/http/proxy/src/main/java/org/apache/felix/http/proxy/ProxyListener.java
+++ b/http/proxy/src/main/java/org/apache/felix/http/proxy/ProxyListener.java
@@ -18,14 +18,14 @@
*/
package org.apache.felix.http.proxy;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.http.HttpSessionAttributeListener;
-import javax.servlet.http.HttpSessionBindingEvent;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionIdListener;
-import javax.servlet.http.HttpSessionListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.http.HttpSessionAttributeListener;
+import jakarta.servlet.http.HttpSessionBindingEvent;
+import jakarta.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionIdListener;
+import jakarta.servlet.http.HttpSessionListener;
import org.apache.felix.http.proxy.impl.EventDispatcherTracker;
import org.apache.felix.http.proxy.impl.ProxyServletContextListener;
diff --git
a/http/proxy/src/main/java/org/apache/felix/http/proxy/ProxyServlet.java
b/http/proxy/src/main/java/org/apache/felix/http/proxy/ProxyServlet.java
index 7add6567d2..d0a60c4022 100644
--- a/http/proxy/src/main/java/org/apache/felix/http/proxy/ProxyServlet.java
+++ b/http/proxy/src/main/java/org/apache/felix/http/proxy/ProxyServlet.java
@@ -16,7 +16,7 @@
*/
package org.apache.felix.http.proxy;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
import org.osgi.framework.BundleContext;
diff --git
a/http/proxy/src/main/java/org/apache/felix/http/proxy/impl/EventDispatcherTracker.java
b/http/proxy/src/main/java/org/apache/felix/http/proxy/impl/EventDispatcherTracker.java
index 9c11700304..de39dbe7ad 100644
---
a/http/proxy/src/main/java/org/apache/felix/http/proxy/impl/EventDispatcherTracker.java
+++
b/http/proxy/src/main/java/org/apache/felix/http/proxy/impl/EventDispatcherTracker.java
@@ -18,9 +18,9 @@ package org.apache.felix.http.proxy.impl;
import java.util.EventListener;
-import javax.servlet.http.HttpSessionAttributeListener;
-import javax.servlet.http.HttpSessionIdListener;
-import javax.servlet.http.HttpSessionListener;
+import jakarta.servlet.http.HttpSessionAttributeListener;
+import jakarta.servlet.http.HttpSessionIdListener;
+import jakarta.servlet.http.HttpSessionListener;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
diff --git
a/http/proxy/src/main/java/org/apache/felix/http/proxy/impl/ProxyServletContextListener.java
b/http/proxy/src/main/java/org/apache/felix/http/proxy/impl/ProxyServletContextListener.java
index ddb6ccf7bc..0996d17801 100644
---
a/http/proxy/src/main/java/org/apache/felix/http/proxy/impl/ProxyServletContextListener.java
+++
b/http/proxy/src/main/java/org/apache/felix/http/proxy/impl/ProxyServletContextListener.java
@@ -18,10 +18,10 @@
*/
package org.apache.felix.http.proxy.impl;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.annotation.WebListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.annotation.WebListener;
import org.apache.felix.http.proxy.AbstractProxyListener;
import org.osgi.framework.BundleContext;
diff --git
a/http/proxy/src/main/java/org/apache/felix/http/proxy/package-info.java
b/http/proxy/src/main/java/org/apache/felix/http/proxy/package-info.java
index e987081055..5526ddf23b 100644
--- a/http/proxy/src/main/java/org/apache/felix/http/proxy/package-info.java
+++ b/http/proxy/src/main/java/org/apache/felix/http/proxy/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("3.1.0")
+@Version("4.0.0")
package org.apache.felix.http.proxy;
import org.osgi.annotation.versioning.Version;
