From da4c115f6a715b633c32414c18107d6887dc8dbd Mon Sep 17 00:00:00 2001 From: Esteban Lopez Valecky Date: Wed, 21 Feb 2024 14:27:50 +0100 Subject: [PATCH] refactor: Update jakarta.servlet-api from 4.0.1 to 5.0.0 resolves Netflix/hollow#655 --- hollow-diff-ui/build.gradle | 2 +- hollow-diff-ui/dependencies.lock | 24 ++++++++--------- .../netflix/hollow/diff/ui/HollowDiffUI.java | 4 +-- .../hollow/diff/ui/HollowDiffUIRouter.java | 4 +-- .../hollow/diff/ui/pages/DiffFieldPage.java | 2 +- .../hollow/diff/ui/pages/DiffObjectPage.java | 2 +- .../diff/ui/pages/DiffOverviewPage.java | 2 +- .../hollow/diff/ui/pages/DiffPage.java | 4 +-- .../hollow/diff/ui/pages/DiffTypePage.java | 2 +- .../diffview/DiffViewOutputGenerator.java | 4 +-- .../diffview/HollowDiffViewProvider.java | 2 +- .../diffview/HollowHistoryViewProvider.java | 2 +- .../diffview/HollowObjectViewProvider.java | 2 +- .../hollow/history/ui/HollowHistoryUI.java | 4 +-- .../ui/pages/HistoricalObjectDiffPage.java | 2 +- .../history/ui/pages/HistoryOverviewPage.java | 4 +-- .../hollow/history/ui/pages/HistoryPage.java | 2 +- .../history/ui/pages/HistoryQueryPage.java | 2 +- .../history/ui/pages/HistoryStatePage.java | 4 +-- .../HistoryStateTypeExpandGroupPage.java | 2 +- .../ui/pages/HistoryStateTypePage.java | 4 +-- hollow-explorer-ui/build.gradle | 2 +- hollow-explorer-ui/dependencies.lock | 24 ++++++++--------- .../hollow/explorer/ui/HollowExplorerUI.java | 4 +-- .../explorer/ui/pages/BrowseSchemaPage.java | 2 +- .../ui/pages/BrowseSelectedTypePage.java | 2 +- .../explorer/ui/pages/HollowExplorerPage.java | 4 +-- .../hollow/explorer/ui/pages/QueryPage.java | 2 +- .../explorer/ui/pages/ShowAllTypesPage.java | 2 +- hollow-ui-tools/build.gradle | 2 +- hollow-ui-tools/dependencies.lock | 24 ++++++++--------- .../com/netflix/hollow/ui/HollowUIRouter.java | 6 ++--- .../netflix/hollow/ui/HollowUISession.java | 6 ++--- .../ui/HttpHandlerWithServletSupport.java | 26 +++++++++---------- 34 files changed, 93 insertions(+), 93 deletions(-) diff --git a/hollow-diff-ui/build.gradle b/hollow-diff-ui/build.gradle index 02a250c674..b8445ea9df 100644 --- 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 index 1bcc7c3e59..8d9d844b51 100644 --- 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 index a6ad368572..59f84f5c05 100644 --- 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 index 2bef9e8f66..f2afa2caca 100644 --- 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 index 95d89e6572..ff44c53863 100644 --- 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 index 08cc8a3a66..8fa9126876 100644 --- 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 index f8aeaa900f..a8f3432640 100644 --- 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 index b11e057eb4..910138729b 100644 --- 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 index f99c692e7d..cbbb65675f 100644 --- 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 index 09ff2c8b03..5f364565af 100644 --- 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 index 930acaa1f1..58a420cb68 100644 --- 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 index f2ce236ad6..121a5f9ded 100644 --- 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 index 6e86b05152..72bf09c2d3 100644 --- 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 index 5453ef8326..9be6d4f822 100644 --- 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/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoricalObjectDiffPage.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoricalObjectDiffPage.java index e5a5e915b6..254f7ac225 100644 --- a/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoricalObjectDiffPage.java +++ b/hollow-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 index f6148a186c..191d10d752 100644 --- 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 index 4e16959928..779efa63cb 100644 --- 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 index 0bc39da966..2b6368585b 100644 --- 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 index 4fe0d6379e..c1165c3917 100644 --- 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/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoryStateTypeExpandGroupPage.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoryStateTypeExpandGroupPage.java index 6c433747f1..7ecccb719c 100644 --- a/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoryStateTypeExpandGroupPage.java +++ b/hollow-diff-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 index 55bbb97a24..ed70cbfd87 100644 --- 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 index ddfa1a7a11..e84cf39966 100644 --- 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 index 2c4af747cd..43d9373e64 100644 --- 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 index 02052611f9..f9333bb149 100644 --- 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 index 3c95cefa5e..edf69f7b43 100644 --- 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/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/BrowseSelectedTypePage.java b/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/BrowseSelectedTypePage.java index 589e3d8194..7b296d1964 100644 --- a/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/BrowseSelectedTypePage.java +++ b/hollow-explorer-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/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/HollowExplorerPage.java b/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/HollowExplorerPage.java index 242d1e503e..704ca2c4f1 100644 --- a/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/HollowExplorerPage.java +++ b/hollow-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; diff --git a/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/QueryPage.java b/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/QueryPage.java index 33758c14b6..2b0770497e 100644 --- a/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/QueryPage.java +++ b/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/QueryPage.java @@ -26,7 +26,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 QueryPage extends HollowExplorerPage { diff --git a/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/ShowAllTypesPage.java b/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/ShowAllTypesPage.java index 56edebd290..424c977a10 100644 --- a/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/ShowAllTypesPage.java +++ b/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/ShowAllTypesPage.java @@ -32,7 +32,7 @@ import java.util.Collections; 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 ShowAllTypesPage extends HollowExplorerPage { diff --git a/hollow-ui-tools/build.gradle b/hollow-ui-tools/build.gradle index 9106c8cf9f..7b13a0113d 100644 --- a/hollow-ui-tools/build.gradle +++ b/hollow-ui-tools/build.gradle @@ -16,7 +16,7 @@ dependencies { implementation 'commons-io:commons-io:2.11.0' 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-ui-tools/dependencies.lock b/hollow-ui-tools/dependencies.lock index b258c3161c..63fff4395d 100644 --- a/hollow-ui-tools/dependencies.lock +++ b/hollow-ui-tools/dependencies.lock @@ -9,8 +9,8 @@ "commons-io:commons-io": { "locked": "2.11.0" }, - "javax.servlet:javax.servlet-api": { - "locked": "4.0.1" + "jakarta.servlet:jakarta.servlet-api": { + "locked": "5.0.0" }, "org.apache.commons:commons-text": { "locked": "1.10.0" @@ -29,8 +29,8 @@ "commons-io:commons-io": { "locked": "2.11.0" }, - "javax.servlet:javax.servlet-api": { - "locked": "4.0.1" + "jakarta.servlet:jakarta.servlet-api": { + "locked": "5.0.0" }, "org.apache.commons:commons-text": { "locked": "1.10.0" @@ -49,8 +49,8 @@ "commons-io:commons-io": { "locked": "2.11.0" }, - "javax.servlet:javax.servlet-api": { - "locked": "4.0.1" + "jakarta.servlet:jakarta.servlet-api": { + "locked": "5.0.0" }, "junit:junit": { "locked": "4.11" @@ -72,8 +72,8 @@ "commons-io:commons-io": { "locked": "2.11.0" }, - "javax.servlet:javax.servlet-api": { - "locked": "4.0.1" + "jakarta.servlet:jakarta.servlet-api": { + "locked": "5.0.0" }, "junit:junit": { "locked": "4.11" @@ -95,8 +95,8 @@ "commons-io:commons-io": { "locked": "2.11.0" }, - "javax.servlet:javax.servlet-api": { - "locked": "4.0.1" + "jakarta.servlet:jakarta.servlet-api": { + "locked": "5.0.0" }, "junit:junit": { "locked": "4.11" @@ -118,8 +118,8 @@ "commons-io:commons-io": { "locked": "2.11.0" }, - "javax.servlet:javax.servlet-api": { - "locked": "4.0.1" + "jakarta.servlet:jakarta.servlet-api": { + "locked": "5.0.0" }, "junit:junit": { "locked": "4.11" diff --git a/hollow-ui-tools/src/main/java/com/netflix/hollow/ui/HollowUIRouter.java b/hollow-ui-tools/src/main/java/com/netflix/hollow/ui/HollowUIRouter.java index 65ec6008c4..50afe3cfed 100644 --- a/hollow-ui-tools/src/main/java/com/netflix/hollow/ui/HollowUIRouter.java +++ b/hollow-ui-tools/src/main/java/com/netflix/hollow/ui/HollowUIRouter.java @@ -20,9 +20,9 @@ import java.io.InputStream; import java.io.PrintWriter; import java.io.StringWriter; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.io.IOUtils; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.runtime.RuntimeConstants; diff --git a/hollow-ui-tools/src/main/java/com/netflix/hollow/ui/HollowUISession.java b/hollow-ui-tools/src/main/java/com/netflix/hollow/ui/HollowUISession.java index c20eecc7d1..9842f1dd15 100644 --- a/hollow-ui-tools/src/main/java/com/netflix/hollow/ui/HollowUISession.java +++ b/hollow-ui-tools/src/main/java/com/netflix/hollow/ui/HollowUISession.java @@ -22,9 +22,9 @@ import java.util.Map; import java.util.Random; import java.util.concurrent.ConcurrentHashMap; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class HollowUISession { diff --git a/hollow-ui-tools/src/main/java/com/netflix/hollow/ui/HttpHandlerWithServletSupport.java b/hollow-ui-tools/src/main/java/com/netflix/hollow/ui/HttpHandlerWithServletSupport.java index f2a16049f2..e8173b11f8 100644 --- a/hollow-ui-tools/src/main/java/com/netflix/hollow/ui/HttpHandlerWithServletSupport.java +++ b/hollow-ui-tools/src/main/java/com/netflix/hollow/ui/HttpHandlerWithServletSupport.java @@ -54,18 +54,18 @@ import java.util.List; import java.util.Map; import java.util.Vector; -import javax.servlet.ReadListener; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletOutputStream; -import javax.servlet.WriteListener; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; -import javax.servlet.http.HttpUtils; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.WriteListener; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.http.HttpUtils; public class HttpHandlerWithServletSupport implements HttpHandler { @@ -215,7 +215,7 @@ public void setHeader(String name, String value) { } @Override - public javax.servlet.ServletOutputStream getOutputStream() throws IOException { + public ServletOutputStream getOutputStream() throws IOException { return servletOutputStream; }