Rewrite all imports to jakarta in integration tests (#144)

gretty-gradle-plugin · Sep 15, 2020 · df894d0 · df894d0
1 parent c4da8a3
commit df894d0
Show file tree

Hide file tree

Showing 26 changed files with 112 additions and 111 deletions.
diff --git a/...raResourceBases/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java b/...raResourceBases/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java
@@ -8,12 +8,12 @@
  */
 package org.akhikhl.examples.gretty.hellogretty;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;

diff --git a/...m/MyWebService/src/main/java/org/akhikhl/examples/gretty/mywebservice/ExampleServlet.java b/...m/MyWebService/src/main/java/org/akhikhl/examples/gretty/mywebservice/ExampleServlet.java
@@ -8,14 +8,14 @@
  */
 package org.akhikhl.examples.gretty.mywebservice;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 public class ExampleServlet extends HttpServlet {
 

diff --git a/...o/MyWebService/src/main/java/org/akhikhl/examples/gretty/mywebservice/ExampleServlet.java b/...o/MyWebService/src/main/java/org/akhikhl/examples/gretty/mywebservice/ExampleServlet.java
@@ -8,14 +8,14 @@
  */
 package org.akhikhl.examples.gretty.mywebservice;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 public class ExampleServlet extends HttpServlet {
 

diff --git a/...e/MyWebService/src/main/java/org/akhikhl/examples/gretty/mywebservice/ExampleServlet.java b/...e/MyWebService/src/main/java/org/akhikhl/examples/gretty/mywebservice/ExampleServlet.java
@@ -8,14 +8,14 @@
  */
 package org.akhikhl.examples.gretty.mywebservice;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 public class ExampleServlet extends HttpServlet {
 

diff --git a/...ts/filterWebapp/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java b/...ts/filterWebapp/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java
@@ -8,12 +8,12 @@
  */
 package org.akhikhl.examples.gretty.hellogretty;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;

diff --git a/integrationTests/gretty-taglib-example/src/main/java/HelloServlet.java b/integrationTests/gretty-taglib-example/src/main/java/HelloServlet.java
@@ -6,10 +6,10 @@
  * See the file "LICENSE" for copying and usage permission.
  * See the file "CONTRIBUTORS" for complete list of contributors.
  */
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Set;
 

diff --git a/...Tests/grettyLogging_logback/src/main/java/org/akhikhl/examples/gretty/ExampleServlet.java b/...Tests/grettyLogging_logback/src/main/java/org/akhikhl/examples/gretty/ExampleServlet.java
@@ -8,12 +8,12 @@
  */
 package org.akhikhl.examples.gretty;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...sts/helloGretty/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java b/...sts/helloGretty/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java
@@ -8,12 +8,12 @@
  */
 package org.akhikhl.examples.gretty.hellogretty;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;

diff --git a/...lloGrettySecure/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java b/...lloGrettySecure/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java
@@ -8,12 +8,12 @@
  */
 package org.akhikhl.examples.gretty.hellogretty;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;

diff --git a/...s/jacocoExample/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java b/...s/jacocoExample/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java
@@ -8,12 +8,12 @@
  */
 package org.akhikhl.examples.gretty.hellogretty;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;

diff --git a/...nstantiateTasks/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java b/...nstantiateTasks/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java
@@ -8,12 +8,12 @@
  */
 package org.akhikhl.examples.gretty.hellogretty;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;

diff --git a/...m/MyWebService/src/main/java/org/akhikhl/examples/gretty/mywebservice/ExampleServlet.java b/...m/MyWebService/src/main/java/org/akhikhl/examples/gretty/mywebservice/ExampleServlet.java
@@ -8,14 +8,14 @@
  */
 package org.akhikhl.examples.gretty.mywebservice;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 public class ExampleServlet extends HttpServlet {
 

diff --git a/.../MyWebService2/src/main/java/org/akhikhl/examples/gretty/mywebservice/ExampleServlet.java b/.../MyWebService2/src/main/java/org/akhikhl/examples/gretty/mywebservice/ExampleServlet.java
@@ -8,14 +8,14 @@
  */
 package org.akhikhl.examples.gretty.mywebservice;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 public class ExampleServlet extends HttpServlet {
 

diff --git a/...jee-webservice/src/main/java/org/akhikhl/examples/gretty/mywebservice/ExampleServlet.java b/...jee-webservice/src/main/java/org/akhikhl/examples/gretty/mywebservice/ExampleServlet.java
@@ -8,14 +8,14 @@
  */
 package org.akhikhl.examples.gretty.mywebservice;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 public class ExampleServlet extends HttpServlet {
 

diff --git a/...jee-webservice/src/main/java/org/akhikhl/examples/gretty/mywebservice/ExampleServlet.java b/...jee-webservice/src/main/java/org/akhikhl/examples/gretty/mywebservice/ExampleServlet.java
@@ -8,14 +8,14 @@
  */
 package org.akhikhl.examples.gretty.mywebservice;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 public class ExampleServlet extends HttpServlet {
 

diff --git a/...testAnnotations/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java b/...testAnnotations/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java
@@ -8,13 +8,13 @@
  */
 package org.akhikhl.examples.gretty.hellogretty;
 
+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 java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;

diff --git a/integrationTests/testDuplicatingResources/src/main/java/HelloServlet2.java b/integrationTests/testDuplicatingResources/src/main/java/HelloServlet2.java
@@ -6,15 +6,16 @@
  * See the file "LICENSE" for copying and usage permission.
  * See the file "CONTRIBUTORS" for complete list of contributors.
  */
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.List;
+import java.net.URL;
 import java.util.Collections;
 import java.util.Enumeration;
-import java.net.URL;
+import java.util.List;
 
 public class HelloServlet2 extends HttpServlet {
 	@Override

diff --git a/...stInitParameter/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java b/...stInitParameter/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java
@@ -8,12 +8,12 @@
  */
 package org.akhikhl.examples.gretty.hellogretty;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;

diff --git a/...tyContextConfig/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java b/...tyContextConfig/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java
@@ -8,12 +8,12 @@
  */
 package org.akhikhl.examples.gretty.hellogretty;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;

diff --git a/...ettyRandomPorts/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java b/...ettyRandomPorts/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java
@@ -8,12 +8,12 @@
  */
 package org.akhikhl.examples.gretty.hellogretty;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;

diff --git a/...ttyServerConfig/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java b/...ttyServerConfig/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java
@@ -8,12 +8,12 @@
  */
 package org.akhikhl.examples.gretty.hellogretty;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;

diff --git a/...atContextConfig/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java b/...atContextConfig/src/main/java/org/akhikhl/examples/gretty/hellogretty/ExampleServlet.java
@@ -8,12 +8,12 @@
  */
 package org.akhikhl.examples.gretty.hellogretty;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;