diff --git a/pom.xml b/pom.xml index 50a3f16..11fbb21 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.samskivert samskivert - 1.10 + 1.11 com.samskivert @@ -58,9 +58,9 @@ 5.1.0 - javax.servlet - servlet-api - 2.5 + jakarta.servlet + jakarta.servlet-api + 6.0.0 provided diff --git a/src/main/java/com/threerings/servlet/DepotSiteIdentifier.java b/src/main/java/com/threerings/servlet/DepotSiteIdentifier.java index 9b5b522..ae31136 100644 --- a/src/main/java/com/threerings/servlet/DepotSiteIdentifier.java +++ b/src/main/java/com/threerings/servlet/DepotSiteIdentifier.java @@ -9,7 +9,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/src/main/java/com/threerings/user/AffiliateInfo.java b/src/main/java/com/threerings/user/AffiliateInfo.java index dc95b54..909f63c 100644 --- a/src/main/java/com/threerings/user/AffiliateInfo.java +++ b/src/main/java/com/threerings/user/AffiliateInfo.java @@ -8,9 +8,9 @@ import static com.threerings.user.Log.log; import java.util.regex.Matcher; import java.util.regex.Pattern; -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; import com.samskivert.io.PersistenceException; import com.samskivert.servlet.SiteIdentifier; diff --git a/src/main/java/com/threerings/user/OOOSiteIdentifier.java b/src/main/java/com/threerings/user/OOOSiteIdentifier.java index c674db8..7790f76 100644 --- a/src/main/java/com/threerings/user/OOOSiteIdentifier.java +++ b/src/main/java/com/threerings/user/OOOSiteIdentifier.java @@ -6,7 +6,7 @@ package com.threerings.user; import java.util.Iterator; import java.util.List; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import com.google.common.collect.Lists; diff --git a/src/main/java/com/threerings/user/OOOUserManager.java b/src/main/java/com/threerings/user/OOOUserManager.java index 3bb5aff..d175b10 100644 --- a/src/main/java/com/threerings/user/OOOUserManager.java +++ b/src/main/java/com/threerings/user/OOOUserManager.java @@ -5,7 +5,7 @@ package com.threerings.user; import java.util.Map; import java.util.Properties; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import com.google.common.collect.Maps; diff --git a/src/main/java/com/threerings/user/UserDataUtil.java b/src/main/java/com/threerings/user/UserDataUtil.java index 7014bcb..f06750b 100644 --- a/src/main/java/com/threerings/user/UserDataUtil.java +++ b/src/main/java/com/threerings/user/UserDataUtil.java @@ -3,7 +3,7 @@ package com.threerings.user; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import com.samskivert.net.MailUtil; import com.samskivert.servlet.util.DataValidationException; diff --git a/src/main/java/com/threerings/user/depot/AffiliateInfo.java b/src/main/java/com/threerings/user/depot/AffiliateInfo.java index 4231f91..781d90f 100644 --- a/src/main/java/com/threerings/user/depot/AffiliateInfo.java +++ b/src/main/java/com/threerings/user/depot/AffiliateInfo.java @@ -8,9 +8,9 @@ import static com.threerings.user.Log.log; import java.util.regex.Matcher; import java.util.regex.Pattern; -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; import com.samskivert.servlet.SiteIdentifier; import com.samskivert.servlet.util.CookieUtil; diff --git a/src/main/java/com/threerings/user/depot/DepotUserManager.java b/src/main/java/com/threerings/user/depot/DepotUserManager.java index 359fe5a..c839112 100644 --- a/src/main/java/com/threerings/user/depot/DepotUserManager.java +++ b/src/main/java/com/threerings/user/depot/DepotUserManager.java @@ -6,9 +6,9 @@ package com.threerings.user.depot; import java.util.Map; import java.util.Properties; -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; import com.google.common.collect.Maps;