Jakarta Servlet API transition
Signed-off-by: Gaurav Gupta <gaurav.gupta@payara.fish>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/client/Client.java
index c1fac52..dd1166b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/client/Client.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.jdbc.cmpsimple.client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import com.sun.s1asdev.jdbc.cmpsimple.ejb.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/servlet/OnlyGetConnectionServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/servlet/OnlyGetConnectionServlet.java
index afdb0a6..5fc92d9 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/servlet/OnlyGetConnectionServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/servlet/OnlyGetConnectionServlet.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.jdbc.onlygetconnectionservlet.servlet;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import jakarta.transaction.*;
import javax.sql.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/servlet/bmservlet4.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/servlet/bmservlet4.java
index 7750ed7..a7023be 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/servlet/bmservlet4.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/servlet/bmservlet4.java
@@ -19,8 +19,8 @@
import java.util.*;
import java.lang.reflect.*;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import javax.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/servlet/bmservlet.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/servlet/bmservlet.java
index 0ff9cd3..d949ae1 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/servlet/bmservlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/servlet/bmservlet.java
@@ -19,8 +19,8 @@
import java.util.*;
import java.lang.reflect.*;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import javax.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/servlet/SimpleServlet.java
index 05fd9b4..9253de6 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/servlet/SimpleServlet.java
@@ -16,10 +16,10 @@
package servlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import jakarta.ejb.CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/servlet/SimpleServlet.java
index d210d1c..d722609 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/servlet/SimpleServlet.java
@@ -16,10 +16,10 @@
package servlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import jakarta.ejb.CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/servlet/SimpleServlet.java
index 46c545c..88496a6 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/servlet/SimpleServlet.java
@@ -16,10 +16,10 @@
package servlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import jakarta.ejb.CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/servlet/SimpleServlet.java
index 57e866c..58208c2 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/servlet/SimpleServlet.java
@@ -16,10 +16,10 @@
package servlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import jakarta.ejb.CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/servlet/SimpleServlet.java
index 1b1700c..e19f64e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/servlet/SimpleServlet.java
@@ -16,10 +16,10 @@
package servlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import jakarta.ejb.CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/servlet/SimpleServlet.java
index 214bea4..64120ba 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/servlet/SimpleServlet.java
@@ -16,10 +16,10 @@
package servlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import jakarta.ejb.CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/servlet/SimpleServlet.java
index b5cd08e..f67de5b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/servlet/SimpleServlet.java
@@ -16,10 +16,10 @@
package servlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import jakarta.ejb.CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/servlet/SimpleServlet.java
index cb47f6c..69f1171 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/servlet/SimpleServlet.java
@@ -16,10 +16,10 @@
package servlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import jakarta.ejb.CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/TestResultServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/TestResultServlet.java
index d25755c..9e92406 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/TestResultServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/TestResultServlet.java
@@ -20,8 +20,8 @@
import java.lang.reflect.Constructor;
import java.net.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.sql.DataSource;
import java.util.Map;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/reconfig/ReconfigTestServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/reconfig/ReconfigTestServlet.java
index 8abbd47..1fc748a 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/reconfig/ReconfigTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/reconfig/ReconfigTestServlet.java
@@ -26,8 +26,8 @@
import java.util.Map;
import jakarta.annotation.Resource;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.sql.DataSource;
/**
