fuly drop jakarta servlet stuff

Worklytics · Jul 16, 2024 · d774f06 · d774f06
1 parent 6fbf9bd
commit d774f06
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/java/pom.xml b/java/pom.xml
@@ -142,12 +142,12 @@
       <artifactId>guava</artifactId>
       <version>[32.1,32.99]</version>
     </dependency>
-    <dependency>
-      <groupId>jakarta.servlet</groupId>
-      <artifactId>jakarta.servlet-api</artifactId>
-      <version>6.1.0</version>
-      <scope>provided</scope>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>jakarta.servlet</groupId>-->
+<!--      <artifactId>jakarta.servlet-api</artifactId>-->
+<!--      <version>6.1.0</version>-->
+<!--      <scope>provided</scope>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>

diff --git a/java/src/test/java/com/google/appengine/tools/cloudtasktest/FakeHttpServletResponse.java b/java/src/test/java/com/google/appengine/tools/cloudtasktest/FakeHttpServletResponse.java
@@ -20,9 +20,8 @@
 import com.google.common.collect.LinkedListMultimap;
 import com.google.common.collect.ListMultimap;
 import com.google.common.net.HttpHeaders;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.*;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -32,7 +31,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 
-/** Simple fake implementation of {@link HttpServletResponse}. */
+/** Simple fake implementation of {@link HttpServletResponse}. Intended for compatibility with jakarta */
 public class FakeHttpServletResponse implements javax.servlet.http.HttpServletResponse {
   private static final String DEFAULT_CHARSET = "ISO-8859-1";
   private final ListMultimap<String, String> headers = LinkedListMultimap.create();