Skip to content

Commit 2c26de7

Browse files
grgrzybekgrgrzybek
committed
[#1802] Switch pax-web-itest-utils from javax to jakarta
1 parent 58b9edf commit 2c26de7

22 files changed

+131
-125
lines changed

‎pax-web-itest/pax-web-itest-utils/pom.xml

+20-14
Original file line numberDiff line numberDiff line change
@@ -61,32 +61,33 @@
6161
<configuration>
6262
<instructions>
6363
<Import-Package>
64-
<!-- ranges indicate Servlet API 3.1+ (JavaEE 7+) -->
65-
javax.servlet;version="[3.1,5)",
66-
javax.servlet.annotation;version="[3.1,5)",
67-
javax.servlet.http;version="[3.1,5)",
68-
javax.websocket;resolution:=optional,
69-
javax.websocket.server;resolution:=optional,
70-
71-
<!-- ranges indicate we can work with OSGi Core R6+ -->
72-
org.osgi.framework;version="[1.8,2)",
64+
<!-- ranges indicate Servlet API 6.0+ (JakartaEE 10+) -->
65+
jakarta.servlet;version="[6,7)",
66+
jakarta.servlet.annotation;version="[6,7)",
67+
jakarta.servlet.http;version="[6,7)",
68+
69+
jakarta.websocket;version="[2.1,3)",
70+
jakarta.websocket.server;version="[2.1,3)",
71+
72+
<!-- OSGi Core R8+ -->
73+
org.osgi.framework;version="[1.10,2)",
7374
org.osgi.framework.wiring;version="[1.2,2)",
7475
org.osgi.util.tracker;version="[1.5,2)",
7576

7677
<!-- from pax-web-api -->
7778
org.ops4j.pax.web.service;version="${pax-web.osgi.version}",
7879

7980
<!-- from pax-logging-api -->
80-
org.slf4j;version="[1.7,2)",
81+
org.slf4j;version="[2,3)",
8182

8283
<!-- other -->
8384
javax.net,
8485
javax.net.ssl,
8586
javax.security.auth.x500
8687
</Import-Package>
8788
<Dynamic-ImportPackage>
88-
javax.websocket,
89-
javax.websocket.*
89+
jakarta.websocket,
90+
jakarta.websocket.*
9091
</Dynamic-ImportPackage>
9192
<Export-Package>
9293
org.ops4j.pax.web.itest.utils.*,
@@ -124,11 +125,11 @@
124125
</dependency>
125126
<dependency>
126127
<groupId>org.osgi</groupId>
127-
<artifactId>osgi.cmpn</artifactId>
128+
<artifactId>org.osgi.service.servlet</artifactId>
128129
<scope>provided</scope>
129130
</dependency>
130131

131-
<!-- JavaEE -->
132+
<!-- JakartaEE -->
132133

133134
<dependency>
134135
<groupId>jakarta.servlet</groupId>
@@ -140,6 +141,11 @@
140141
<artifactId>jakarta.websocket-api</artifactId>
141142
<scope>provided</scope>
142143
</dependency>
144+
<dependency>
145+
<groupId>jakarta.websocket</groupId>
146+
<artifactId>jakarta.websocket-client-api</artifactId>
147+
<scope>provided</scope>
148+
</dependency>
143149

144150
<!-- Logging -->
145151

‎pax-web-itest/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/AnnotatedMultipartTestServlet.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
package org.ops4j.pax.web.itest.utils.web;
1717

1818
import java.io.IOException;
19-
import javax.servlet.ServletException;
20-
import javax.servlet.annotation.MultipartConfig;
21-
import javax.servlet.annotation.WebServlet;
22-
import javax.servlet.http.HttpServlet;
23-
import javax.servlet.http.HttpServletRequest;
24-
import javax.servlet.http.HttpServletResponse;
25-
import javax.servlet.http.Part;
19+
import jakarta.servlet.ServletException;
20+
import jakarta.servlet.annotation.MultipartConfig;
21+
import jakarta.servlet.annotation.WebServlet;
22+
import jakarta.servlet.http.HttpServlet;
23+
import jakarta.servlet.http.HttpServletRequest;
24+
import jakarta.servlet.http.HttpServletResponse;
25+
import jakarta.servlet.http.Part;
2626

2727
@WebServlet(value = "/multipartest", name = "multipartest")
2828
@MultipartConfig(

‎pax-web-itest/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/AnnotatedTestFilter.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
import java.io.IOException;
1919
import java.net.URL;
2020

21-
import javax.servlet.Filter;
22-
import javax.servlet.FilterChain;
23-
import javax.servlet.FilterConfig;
24-
import javax.servlet.ServletException;
25-
import javax.servlet.ServletRequest;
26-
import javax.servlet.ServletResponse;
27-
import javax.servlet.annotation.WebFilter;
21+
import jakarta.servlet.Filter;
22+
import jakarta.servlet.FilterChain;
23+
import jakarta.servlet.FilterConfig;
24+
import jakarta.servlet.ServletException;
25+
import jakarta.servlet.ServletRequest;
26+
import jakarta.servlet.ServletResponse;
27+
import jakarta.servlet.annotation.WebFilter;
2828

2929
@WebFilter(value = "/*")
3030
public class AnnotatedTestFilter implements Filter {

‎pax-web-itest/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/AnnotatedTestServlet.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
import java.io.IOException;
1919
import java.util.concurrent.CountDownLatch;
2020
import java.util.concurrent.TimeUnit;
21-
import javax.servlet.ServletConfig;
22-
import javax.servlet.ServletException;
23-
import javax.servlet.annotation.WebServlet;
24-
import javax.servlet.http.HttpServlet;
25-
import javax.servlet.http.HttpServletRequest;
26-
import javax.servlet.http.HttpServletResponse;
21+
import jakarta.servlet.ServletConfig;
22+
import jakarta.servlet.ServletException;
23+
import jakarta.servlet.annotation.WebServlet;
24+
import jakarta.servlet.http.HttpServlet;
25+
import jakarta.servlet.http.HttpServletRequest;
26+
import jakarta.servlet.http.HttpServletResponse;
2727

2828
import org.slf4j.Logger;
2929
import org.slf4j.LoggerFactory;

‎pax-web-itest/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/AsyncFilter.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
package org.ops4j.pax.web.itest.utils.web;
1717

1818
import java.io.IOException;
19-
import javax.servlet.Filter;
20-
import javax.servlet.FilterChain;
21-
import javax.servlet.FilterConfig;
22-
import javax.servlet.ServletException;
23-
import javax.servlet.ServletRequest;
24-
import javax.servlet.ServletResponse;
25-
import javax.servlet.annotation.WebFilter;
26-
import javax.servlet.http.HttpServletResponse;
19+
import jakarta.servlet.Filter;
20+
import jakarta.servlet.FilterChain;
21+
import jakarta.servlet.FilterConfig;
22+
import jakarta.servlet.ServletException;
23+
import jakarta.servlet.ServletRequest;
24+
import jakarta.servlet.ServletResponse;
25+
import jakarta.servlet.annotation.WebFilter;
26+
import jakarta.servlet.http.HttpServletResponse;
2727

2828
@WebFilter(asyncSupported = true)
2929
public class AsyncFilter implements Filter {

‎pax-web-itest/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/AsyncServlet.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
import java.util.Arrays;
2020
import java.util.concurrent.ExecutorService;
2121
import java.util.concurrent.Executors;
22-
import javax.servlet.AsyncContext;
23-
import javax.servlet.ServletException;
24-
import javax.servlet.annotation.WebServlet;
25-
import javax.servlet.http.HttpServlet;
26-
import javax.servlet.http.HttpServletRequest;
27-
import javax.servlet.http.HttpServletResponse;
22+
import jakarta.servlet.AsyncContext;
23+
import jakarta.servlet.ServletException;
24+
import jakarta.servlet.annotation.WebServlet;
25+
import jakarta.servlet.http.HttpServlet;
26+
import jakarta.servlet.http.HttpServletRequest;
27+
import jakarta.servlet.http.HttpServletResponse;
2828

2929
@WebServlet(asyncSupported = true)
3030
public class AsyncServlet extends HttpServlet {

‎pax-web-itest/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/BrokenServlet.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
import java.lang.reflect.InvocationTargetException;
2121
import java.util.Dictionary;
2222
import java.util.Hashtable;
23-
import javax.servlet.Servlet;
24-
import javax.servlet.ServletException;
25-
import javax.servlet.http.HttpServlet;
26-
import javax.servlet.http.HttpServletRequest;
27-
import javax.servlet.http.HttpServletResponse;
23+
import jakarta.servlet.Servlet;
24+
import jakarta.servlet.ServletException;
25+
import jakarta.servlet.http.HttpServlet;
26+
import jakarta.servlet.http.HttpServletRequest;
27+
import jakarta.servlet.http.HttpServletResponse;
2828

2929
import org.osgi.framework.BundleContext;
3030
import org.osgi.framework.ServiceRegistration;
31-
import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
31+
import org.osgi.service.servlet.whiteboard.HttpWhiteboardConstants;
3232

3333
public class BrokenServlet extends HttpServlet {
3434

‎pax-web-itest/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/Bundle1Activator.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717

1818
import java.util.Dictionary;
1919
import java.util.Hashtable;
20-
import javax.servlet.Filter;
21-
import javax.servlet.Servlet;
20+
import jakarta.servlet.Filter;
21+
import jakarta.servlet.Servlet;
2222

2323
import org.ops4j.pax.web.service.PaxWebConstants;
2424
import org.ops4j.pax.web.service.WebContainer;
25+
import org.ops4j.pax.web.service.http.HttpContext;
2526
import org.osgi.framework.BundleActivator;
2627
import org.osgi.framework.BundleContext;
2728
import org.osgi.framework.ServiceReference;
2829
import org.osgi.framework.ServiceRegistration;
29-
import org.osgi.service.http.HttpContext;
3030

3131
public class Bundle1Activator implements BundleActivator {
3232

‎pax-web-itest/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/Bundle1Filter.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
package org.ops4j.pax.web.itest.utils.web;
2020

2121
import java.io.IOException;
22-
import javax.servlet.Filter;
23-
import javax.servlet.FilterChain;
24-
import javax.servlet.FilterConfig;
25-
import javax.servlet.ServletException;
26-
import javax.servlet.ServletRequest;
27-
import javax.servlet.ServletResponse;
22+
import jakarta.servlet.Filter;
23+
import jakarta.servlet.FilterChain;
24+
import jakarta.servlet.FilterConfig;
25+
import jakarta.servlet.ServletException;
26+
import jakarta.servlet.ServletRequest;
27+
import jakarta.servlet.ServletResponse;
2828

2929
import org.slf4j.Logger;
3030
import org.slf4j.LoggerFactory;

‎pax-web-itest/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/Bundle1Servlet.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
package org.ops4j.pax.web.itest.utils.web;
2020

2121
import java.io.IOException;
22-
import javax.servlet.ServletException;
23-
import javax.servlet.http.HttpServlet;
24-
import javax.servlet.http.HttpServletRequest;
25-
import javax.servlet.http.HttpServletResponse;
22+
import jakarta.servlet.ServletException;
23+
import jakarta.servlet.http.HttpServlet;
24+
import jakarta.servlet.http.HttpServletRequest;
25+
import jakarta.servlet.http.HttpServletResponse;
2626

2727
import org.slf4j.Logger;
2828
import org.slf4j.LoggerFactory;

‎pax-web-itest/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/Bundle1SharedFilter.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
package org.ops4j.pax.web.itest.utils.web;
2020

2121
import java.io.IOException;
22-
import javax.servlet.Filter;
23-
import javax.servlet.FilterChain;
24-
import javax.servlet.FilterConfig;
25-
import javax.servlet.ServletException;
26-
import javax.servlet.ServletRequest;
27-
import javax.servlet.ServletResponse;
22+
import jakarta.servlet.Filter;
23+
import jakarta.servlet.FilterChain;
24+
import jakarta.servlet.FilterConfig;
25+
import jakarta.servlet.ServletException;
26+
import jakarta.servlet.ServletRequest;
27+
import jakarta.servlet.ServletResponse;
2828

2929
import org.slf4j.Logger;
3030
import org.slf4j.LoggerFactory;

‎pax-web-itest/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/Bundle2SharedFilter.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
package org.ops4j.pax.web.itest.utils.web;
2020

2121
import java.io.IOException;
22-
import javax.servlet.Filter;
23-
import javax.servlet.FilterChain;
24-
import javax.servlet.FilterConfig;
25-
import javax.servlet.ServletException;
26-
import javax.servlet.ServletRequest;
27-
import javax.servlet.ServletResponse;
22+
import jakarta.servlet.Filter;
23+
import jakarta.servlet.FilterChain;
24+
import jakarta.servlet.FilterConfig;
25+
import jakarta.servlet.ServletException;
26+
import jakarta.servlet.ServletRequest;
27+
import jakarta.servlet.ServletResponse;
2828

2929
import org.slf4j.Logger;
3030
import org.slf4j.LoggerFactory;

‎pax-web-itest/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/Bundle2SharedServlet.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
package org.ops4j.pax.web.itest.utils.web;
2020

2121
import java.io.IOException;
22-
import javax.servlet.ServletException;
23-
import javax.servlet.http.HttpServlet;
24-
import javax.servlet.http.HttpServletRequest;
25-
import javax.servlet.http.HttpServletResponse;
22+
import jakarta.servlet.ServletException;
23+
import jakarta.servlet.http.HttpServlet;
24+
import jakarta.servlet.http.HttpServletRequest;
25+
import jakarta.servlet.http.HttpServletResponse;
2626

2727
import org.slf4j.Logger;
2828
import org.slf4j.LoggerFactory;

‎pax-web-itest/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/ErrorServlet.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717

1818
import java.io.IOException;
1919
import java.util.Dictionary;
20-
import javax.servlet.RequestDispatcher;
21-
import javax.servlet.Servlet;
22-
import javax.servlet.ServletException;
23-
import javax.servlet.http.HttpServlet;
24-
import javax.servlet.http.HttpServletRequest;
25-
import javax.servlet.http.HttpServletResponse;
20+
import jakarta.servlet.RequestDispatcher;
21+
import jakarta.servlet.Servlet;
22+
import jakarta.servlet.ServletException;
23+
import jakarta.servlet.http.HttpServlet;
24+
import jakarta.servlet.http.HttpServletRequest;
25+
import jakarta.servlet.http.HttpServletResponse;
2626

2727
import org.osgi.framework.BundleContext;
2828
import org.osgi.framework.ServiceRegistration;

‎pax-web-itest/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/FilterBundleActivator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package org.ops4j.pax.web.itest.utils.web;
1717

1818
import java.util.Hashtable;
19-
import javax.servlet.Filter;
19+
import jakarta.servlet.Filter;
2020

2121
import org.ops4j.pax.web.service.PaxWebConstants;
2222
import org.osgi.framework.BundleActivator;

‎pax-web-itest/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/ServletBundleActivator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package org.ops4j.pax.web.itest.utils.web;
1717

1818
import java.util.Hashtable;
19-
import javax.servlet.Servlet;
19+
import jakarta.servlet.Servlet;
2020

2121
import org.ops4j.pax.web.service.PaxWebConstants;
2222
import org.ops4j.pax.web.service.WebContainer;

‎pax-web-itest/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/SimpleFilter.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717

1818
import java.io.IOException;
1919
import java.net.URL;
20-
import javax.servlet.Filter;
21-
import javax.servlet.FilterChain;
22-
import javax.servlet.FilterConfig;
23-
import javax.servlet.ServletException;
24-
import javax.servlet.ServletRequest;
25-
import javax.servlet.ServletResponse;
20+
import jakarta.servlet.Filter;
21+
import jakarta.servlet.FilterChain;
22+
import jakarta.servlet.FilterConfig;
23+
import jakarta.servlet.ServletException;
24+
import jakarta.servlet.ServletRequest;
25+
import jakarta.servlet.ServletResponse;
2626

2727
public class SimpleFilter implements Filter {
2828

‎pax-web-itest/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/SimpleOnlyFilter.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
package org.ops4j.pax.web.itest.utils.web;
1717

1818
import java.io.IOException;
19-
import javax.servlet.Filter;
20-
import javax.servlet.FilterChain;
21-
import javax.servlet.FilterConfig;
22-
import javax.servlet.ServletException;
23-
import javax.servlet.ServletRequest;
24-
import javax.servlet.ServletResponse;
25-
import javax.servlet.http.HttpServletResponse;
19+
import jakarta.servlet.Filter;
20+
import jakarta.servlet.FilterChain;
21+
import jakarta.servlet.FilterConfig;
22+
import jakarta.servlet.ServletException;
23+
import jakarta.servlet.ServletRequest;
24+
import jakarta.servlet.ServletResponse;
25+
import jakarta.servlet.http.HttpServletResponse;
2626

2727
public class SimpleOnlyFilter implements Filter {
2828

0 commit comments

Comments
 (0)