refactor: Update jakarta.servlet-api from 4.0.1 to 5.0.0

resolves #655
Netflix · Feb 22, 2024 · da4c115 · da4c115
1 parent 8857c90
commit da4c115
Show file tree

Hide file tree

Showing 34 changed files with 93 additions and 93 deletions.
diff --git a/hollow-diff-ui/build.gradle b/hollow-diff-ui/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation project(':hollow-test')
     implementation 'com.google.code.gson:gson:2.10.1'
 
-    implementation "javax.servlet:javax.servlet-api:4.0.1"
+    implementation "jakarta.servlet:jakarta.servlet-api:5.0.0"
 
     testImplementation 'junit:junit:4.11'
 }
diff --git a/hollow-diff-ui/dependencies.lock b/hollow-diff-ui/dependencies.lock
@@ -15,8 +15,8 @@
         "com.netflix.hollow:hollow-ui-tools": {
             "project": true
         },
-        "javax.servlet:javax.servlet-api": {
-            "locked": "4.0.1"
+        "jakarta.servlet:jakarta.servlet-api": {
+            "locked": "5.0.0"
         },
         "org.apache.velocity:velocity-engine-core": {
             "firstLevelTransitive": [
@@ -51,11 +51,11 @@
             ],
             "locked": "2.11.0"
         },
-        "javax.servlet:javax.servlet-api": {
+        "jakarta.servlet:jakarta.servlet-api": {
             "firstLevelTransitive": [
                 "com.netflix.hollow:hollow-ui-tools"
             ],
-            "locked": "4.0.1"
+            "locked": "5.0.0"
         },
         "org.apache.commons:commons-text": {
             "firstLevelTransitive": [
@@ -86,8 +86,8 @@
         "com.netflix.hollow:hollow-ui-tools": {
             "project": true
         },
-        "javax.servlet:javax.servlet-api": {
-            "locked": "4.0.1"
+        "jakarta.servlet:jakarta.servlet-api": {
+            "locked": "5.0.0"
         },
         "junit:junit": {
             "locked": "4.11"
@@ -125,11 +125,11 @@
             ],
             "locked": "2.11.0"
         },
-        "javax.servlet:javax.servlet-api": {
+        "jakarta.servlet:jakarta.servlet-api": {
             "firstLevelTransitive": [
                 "com.netflix.hollow:hollow-ui-tools"
             ],
-            "locked": "4.0.1"
+            "locked": "5.0.0"
         },
         "junit:junit": {
             "locked": "4.11"
@@ -163,8 +163,8 @@
         "com.netflix.hollow:hollow-ui-tools": {
             "project": true
         },
-        "javax.servlet:javax.servlet-api": {
-            "locked": "4.0.1"
+        "jakarta.servlet:jakarta.servlet-api": {
+            "locked": "5.0.0"
         },
         "junit:junit": {
             "locked": "4.11"
@@ -202,11 +202,11 @@
             ],
             "locked": "2.11.0"
         },
-        "javax.servlet:javax.servlet-api": {
+        "jakarta.servlet:jakarta.servlet-api": {
             "firstLevelTransitive": [
                 "com.netflix.hollow:hollow-ui-tools"
             ],
-            "locked": "4.0.1"
+            "locked": "5.0.0"
         },
         "junit:junit": {
             "locked": "4.11"

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/HollowDiffUI.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/HollowDiffUI.java
@@ -35,8 +35,8 @@
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.velocity.app.VelocityEngine;
 
 public class HollowDiffUI implements HollowRecordDiffUI {

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/HollowDiffUIRouter.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/HollowDiffUIRouter.java
@@ -21,8 +21,8 @@
 import java.io.IOException;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 public class HollowDiffUIRouter extends HollowUIRouter {
 

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/pages/DiffFieldPage.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/pages/DiffFieldPage.java
@@ -25,7 +25,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.velocity.VelocityContext;
 
 public class DiffFieldPage extends DiffPage {

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/pages/DiffObjectPage.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/pages/DiffObjectPage.java
@@ -24,7 +24,7 @@
 import com.netflix.hollow.ui.HollowUISession;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.velocity.VelocityContext;
 
 public class DiffObjectPage extends DiffPage {

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/pages/DiffOverviewPage.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/pages/DiffOverviewPage.java
@@ -24,7 +24,7 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.velocity.VelocityContext;
 
 public class DiffOverviewPage extends DiffPage {

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/pages/DiffPage.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/pages/DiffPage.java
@@ -29,8 +29,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/pages/DiffTypePage.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/pages/DiffTypePage.java
@@ -30,7 +30,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.velocity.VelocityContext;
 
 public class DiffTypePage extends DiffPage {

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/diffview/DiffViewOutputGenerator.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/diffview/DiffViewOutputGenerator.java
@@ -20,8 +20,8 @@
 import com.netflix.hollow.ui.HollowUISession;
 import java.io.IOException;
 import java.io.Writer;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 public class DiffViewOutputGenerator {
 

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/diffview/HollowDiffViewProvider.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/diffview/HollowDiffViewProvider.java
@@ -18,7 +18,7 @@
 
 import com.netflix.hollow.diff.ui.HollowDiffUI;
 import com.netflix.hollow.ui.HollowUISession;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public class HollowDiffViewProvider implements HollowObjectViewProvider {
 

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/diffview/HollowHistoryViewProvider.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/diffview/HollowHistoryViewProvider.java
@@ -20,7 +20,7 @@
 import com.netflix.hollow.tools.history.HollowHistoricalState;
 import com.netflix.hollow.tools.history.keyindex.HollowHistoricalStateTypeKeyOrdinalMapping;
 import com.netflix.hollow.ui.HollowUISession;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public class HollowHistoryViewProvider implements HollowObjectViewProvider {
 

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/diffview/HollowObjectViewProvider.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/diffview/HollowObjectViewProvider.java
@@ -17,7 +17,7 @@
 package com.netflix.hollow.diffview;
 
 import com.netflix.hollow.ui.HollowUISession;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public interface HollowObjectViewProvider {
 

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/HollowHistoryUI.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/HollowHistoryUI.java
@@ -40,8 +40,8 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TimeZone;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 public class HollowHistoryUI extends HollowUIRouter implements HollowRecordDiffUI {
 

diff --git a/...w-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoricalObjectDiffPage.java b/...w-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoricalObjectDiffPage.java
@@ -27,7 +27,7 @@
 import com.netflix.hollow.ui.HollowUISession;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.velocity.VelocityContext;
 
 public class HistoricalObjectDiffPage extends HistoryPage {

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoryOverviewPage.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoryOverviewPage.java
@@ -29,8 +29,8 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.velocity.VelocityContext;
 
 public class HistoryOverviewPage extends HistoryPage {

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoryPage.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoryPage.java
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoryQueryPage.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoryQueryPage.java
@@ -28,7 +28,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.velocity.VelocityContext;
 
 public class HistoryQueryPage extends HistoryPage {

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoryStatePage.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoryStatePage.java
@@ -29,8 +29,8 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.velocity.VelocityContext;
 
 public class HistoryStatePage extends HistoryPage {

diff --git a/...ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoryStateTypeExpandGroupPage.java b/...ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoryStateTypeExpandGroupPage.java
@@ -19,7 +19,7 @@
 import com.netflix.hollow.history.ui.HollowHistoryUI;
 import com.netflix.hollow.history.ui.model.HistoryStateTypeChanges;
 import com.netflix.hollow.ui.HollowUISession;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.velocity.VelocityContext;
 
 public class HistoryStateTypeExpandGroupPage extends HistoryPage {

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoryStateTypePage.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoryStateTypePage.java
@@ -31,8 +31,8 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.velocity.VelocityContext;
 
 public class HistoryStateTypePage extends HistoryPage {

diff --git a/hollow-explorer-ui/build.gradle b/hollow-explorer-ui/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     api project(':hollow')
     api project(':hollow-ui-tools')
 
-    implementation "javax.servlet:javax.servlet-api:4.0.1"
+    implementation "jakarta.servlet:jakarta.servlet-api:5.0.0"
 
     testImplementation 'junit:junit:4.11'
 }
diff --git a/hollow-explorer-ui/dependencies.lock b/hollow-explorer-ui/dependencies.lock
@@ -9,8 +9,8 @@
         "com.netflix.hollow:hollow-ui-tools": {
             "project": true
         },
-        "javax.servlet:javax.servlet-api": {
-            "locked": "4.0.1"
+        "jakarta.servlet:jakarta.servlet-api": {
+            "locked": "5.0.0"
         },
         "org.apache.velocity:velocity-engine-core": {
             "firstLevelTransitive": [
@@ -41,11 +41,11 @@
             ],
             "locked": "2.11.0"
         },
-        "javax.servlet:javax.servlet-api": {
+        "jakarta.servlet:jakarta.servlet-api": {
             "firstLevelTransitive": [
                 "com.netflix.hollow:hollow-ui-tools"
             ],
-            "locked": "4.0.1"
+            "locked": "5.0.0"
         },
         "org.apache.commons:commons-text": {
             "firstLevelTransitive": [
@@ -70,8 +70,8 @@
         "com.netflix.hollow:hollow-ui-tools": {
             "project": true
         },
-        "javax.servlet:javax.servlet-api": {
-            "locked": "4.0.1"
+        "jakarta.servlet:jakarta.servlet-api": {
+            "locked": "5.0.0"
         },
         "junit:junit": {
             "locked": "4.11"
@@ -105,11 +105,11 @@
             ],
             "locked": "2.11.0"
         },
-        "javax.servlet:javax.servlet-api": {
+        "jakarta.servlet:jakarta.servlet-api": {
             "firstLevelTransitive": [
                 "com.netflix.hollow:hollow-ui-tools"
             ],
-            "locked": "4.0.1"
+            "locked": "5.0.0"
         },
         "junit:junit": {
             "locked": "4.11"
@@ -137,8 +137,8 @@
         "com.netflix.hollow:hollow-ui-tools": {
             "project": true
         },
-        "javax.servlet:javax.servlet-api": {
-            "locked": "4.0.1"
+        "jakarta.servlet:jakarta.servlet-api": {
+            "locked": "5.0.0"
         },
         "junit:junit": {
             "locked": "4.11"
@@ -172,11 +172,11 @@
             ],
             "locked": "2.11.0"
         },
-        "javax.servlet:javax.servlet-api": {
+        "jakarta.servlet:jakarta.servlet-api": {
             "firstLevelTransitive": [
                 "com.netflix.hollow:hollow-ui-tools"
             ],
-            "locked": "4.0.1"
+            "locked": "5.0.0"
         },
         "junit:junit": {
             "locked": "4.11"

diff --git a/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/HollowExplorerUI.java b/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/HollowExplorerUI.java
@@ -27,8 +27,8 @@
 import com.netflix.hollow.ui.HollowUISession;
 import java.io.IOException;
 import java.util.HashMap;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("deprecation")
 public class HollowExplorerUI extends HollowUIRouter {

diff --git a/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/BrowseSchemaPage.java b/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/BrowseSchemaPage.java
@@ -21,7 +21,7 @@
 import com.netflix.hollow.explorer.ui.model.SchemaDisplayField;
 import com.netflix.hollow.ui.HollowUISession;
 import java.io.Writer;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.velocity.VelocityContext;
 
 public class BrowseSchemaPage extends HollowExplorerPage {

diff --git a/...xplorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/BrowseSelectedTypePage.java b/...xplorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/BrowseSelectedTypePage.java
@@ -42,7 +42,7 @@
 import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.velocity.VelocityContext;
 
 public class BrowseSelectedTypePage extends HollowExplorerPage {

diff --git a/...ow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/HollowExplorerPage.java b/...ow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/HollowExplorerPage.java
@@ -21,8 +21,8 @@
 import com.netflix.hollow.ui.HollowUISession;
 import java.io.IOException;
 import java.io.Writer;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;