Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update jakarta.servlet-api from 4.0.1 to 5.0.0 #667

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update jakarta.servlet-api from 4.0.1 to 5.0.0 #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hollow-diff-ui/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
24 changes: 12 additions & 12 deletions hollow-diff-ui/dependencies.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/HollowDiffUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/HollowDiffUIRouter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/pages/DiffFieldPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/pages/DiffObjectPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/pages/DiffOverviewPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/pages/DiffPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/pages/DiffTypePage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions hollow-diff-ui/src/main/java/com/netflix/hollow/diffview/DiffViewOutputGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion hollow-diff-ui/src/main/java/com/netflix/hollow/diffview/HollowDiffViewProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion hollow-diff-ui/src/main/java/com/netflix/hollow/diffview/HollowHistoryViewProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion hollow-diff-ui/src/main/java/com/netflix/hollow/diffview/HollowObjectViewProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/HollowHistoryUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion ...w-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoricalObjectDiffPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoryOverviewPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoryPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoryQueryPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoryStatePage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoryStateTypeExpandGroupPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/pages/HistoryStateTypePage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion hollow-explorer-ui/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
24 changes: 12 additions & 12 deletions hollow-explorer-ui/dependencies.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -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": [
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/HollowExplorerUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/BrowseSchemaPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...xplorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/BrowseSelectedTypePage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions ...ow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/HollowExplorerPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading