jakarta.servlet replace javax.servlet

demos/client-demo/pom.xml

@@ -34,7 +34,7 @@
     <oltu.oauth2.jwt.version>1.0.4-SNAPSHOT</oltu.oauth2.jwt.version>
     <oltu.oidc.version>0.0.1-SNAPSHOT</oltu.oidc.version>
     <org.springframework.version>3.2.18.RELEASE</org.springframework.version>
-    <servlet-api.version>2.5</servlet-api.version>
+    <servlet-api.version>6.0.0</servlet-api.version>
     <slf4j.version>1.7.25</slf4j.version>
   </properties>
 
@@ -125,19 +125,19 @@
     </dependency>
 
     <!-- URL Rewrite -->
-    <!--  URL Rewrite -->
     <dependency>
       <groupId>org.tuckey</groupId>
       <artifactId>urlrewritefilter</artifactId>
       <version>3.1.0</version>
       <scope>runtime</scope>
     </dependency>
 
+    <!-- Jakarta Servlet 6.0  -->
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>${servlet-api.version}</version>
-      <scope>provided</scope>
+        <groupId>jakarta.servlet</groupId>
+        <artifactId>jakarta.servlet-api</artifactId>
+         <version>${servlet-api.version}</version>
+        <scope>provided</scope>
     </dependency>
 
     <!--

demos/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/Utils.java

@@ -21,17 +21,17 @@
 
 package org.apache.oltu.oauth2.client.demo;
 
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+
 import org.apache.oltu.oauth2.client.demo.exception.ApplicationException;
 import org.apache.oltu.oauth2.client.demo.model.OAuthParams;
 import org.apache.oltu.oauth2.client.demo.model.OAuthRegParams;
 import org.apache.oltu.oauth2.common.OAuthProviderType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-
 @Component
 public final class Utils {
 

demos/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/AuthzController.java

@@ -20,6 +20,12 @@
  */
 package org.apache.oltu.oauth2.client.demo.controller;
 
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
+
 import org.apache.oltu.oauth2.client.demo.Utils;
 import org.apache.oltu.oauth2.client.demo.exception.ApplicationException;
 import org.apache.oltu.oauth2.client.demo.model.OAuthParams;
@@ -35,11 +41,6 @@
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.RedirectView;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
 /**
  * Handles requests for the application welcome page.
  */

demos/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/RedirectController.java

@@ -21,6 +21,10 @@
 
 package org.apache.oltu.oauth2.client.demo.controller;
 
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 import org.apache.oltu.oauth2.client.demo.Utils;
 import org.apache.oltu.oauth2.client.demo.model.OAuthParams;
 import org.apache.oltu.oauth2.client.response.OAuthAuthzResponse;
@@ -33,10 +37,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 @Controller
 public class RedirectController {
     private Logger logger = LoggerFactory.getLogger(RedirectController.class);

demos/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/RegistrationController.java

@@ -21,6 +21,10 @@
 
 package org.apache.oltu.oauth2.client.demo.controller;
 
+import jakarta.servlet.http.HttpServletRequest;
+
+import java.io.IOException;
+
 import org.apache.oltu.oauth2.client.URLConnectionClient;
 import org.apache.oltu.oauth2.client.demo.Utils;
 import org.apache.oltu.oauth2.client.demo.exception.ApplicationException;
@@ -41,9 +45,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-
 @Controller
 public class RegistrationController {
 

demos/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/ResourceController.java

@@ -21,6 +21,8 @@
 
 package org.apache.oltu.oauth2.client.demo.controller;
 
+import jakarta.servlet.http.HttpServletRequest;
+
 import org.apache.oltu.oauth2.client.OAuthClient;
 import org.apache.oltu.oauth2.client.URLConnectionClient;
 import org.apache.oltu.oauth2.client.demo.Utils;
@@ -37,8 +39,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletRequest;
-
 @Controller
 public class ResourceController {
 

demos/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/TokenController.java

@@ -21,6 +21,11 @@
 
 package org.apache.oltu.oauth2.client.demo.controller;
 
+import jakarta.servlet.http.HttpServletRequest;
+
+import java.io.IOException;
+import java.net.URI;
+
 import org.apache.oltu.oauth2.client.OAuthClient;
 import org.apache.oltu.oauth2.client.URLConnectionClient;
 import org.apache.oltu.oauth2.client.demo.Utils;
@@ -45,10 +50,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.net.URI;
-
 @Controller
 public class TokenController {
     private Logger logger = LoggerFactory.getLogger(TokenController.class);

oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/AbstractOAuthTokenRequest.java

@@ -17,7 +17,7 @@
 
 package org.apache.oltu.oauth2.as.request;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.oltu.oauth2.common.OAuth;
 import org.apache.oltu.oauth2.common.exception.OAuthProblemException;

oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/OAuthAuthzRequest.java

@@ -21,7 +21,7 @@
 
 package org.apache.oltu.oauth2.as.request;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.oltu.oauth2.as.validator.CodeValidator;
 import org.apache.oltu.oauth2.as.validator.TokenValidator;

oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/OAuthRequest.java

@@ -21,12 +21,12 @@
 
 package org.apache.oltu.oauth2.as.request;
 
+import jakarta.servlet.http.HttpServletRequest;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.apache.oltu.oauth2.common.OAuth;
 import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
 import org.apache.oltu.oauth2.common.exception.OAuthSystemException;

oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/OAuthTokenRequest.java

@@ -21,7 +21,7 @@
 
 package org.apache.oltu.oauth2.as.request;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.oltu.oauth2.as.validator.AuthorizationCodeValidator;
 import org.apache.oltu.oauth2.as.validator.ClientCredentialValidator;

oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/OAuthUnauthenticatedTokenRequest.java

@@ -17,17 +17,14 @@
 
 package org.apache.oltu.oauth2.as.request;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
-import org.apache.oltu.oauth2.as.validator.PasswordValidator;
 import org.apache.oltu.oauth2.as.validator.UnauthenticatedAuthorizationCodeValidator;
 import org.apache.oltu.oauth2.as.validator.UnauthenticatedPasswordValidator;
 import org.apache.oltu.oauth2.as.validator.UnauthenticatedRefreshTokenValidator;
-import org.apache.oltu.oauth2.common.OAuth;
 import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
 import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
 import org.apache.oltu.oauth2.common.message.types.GrantType;
-import org.apache.oltu.oauth2.common.utils.OAuthUtils;
 import org.apache.oltu.oauth2.common.validators.OAuthValidator;
 
 /**

oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/response/OAuthASResponse.java

@@ -22,7 +22,7 @@
 package org.apache.oltu.oauth2.as.response;
 
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.oltu.oauth2.common.OAuth;
 import org.apache.oltu.oauth2.common.message.OAuthResponse;

oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/AuthorizationCodeValidator.java

@@ -21,7 +21,7 @@
 
 package org.apache.oltu.oauth2.as.validator;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.oltu.oauth2.common.OAuth;
 import org.apache.oltu.oauth2.common.validators.AbstractValidator;

oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/ClientCredentialValidator.java

@@ -21,7 +21,7 @@
 
 package org.apache.oltu.oauth2.as.validator;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.oltu.oauth2.common.OAuth;
 import org.apache.oltu.oauth2.common.validators.AbstractValidator;

oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/CodeTokenValidator.java

@@ -22,7 +22,7 @@
 
 package org.apache.oltu.oauth2.as.validator;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.oltu.oauth2.common.OAuth;
 import org.apache.oltu.oauth2.common.error.OAuthError;

oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/CodeValidator.java

@@ -21,7 +21,7 @@
 
 package org.apache.oltu.oauth2.as.validator;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.oltu.oauth2.common.OAuth;
 import org.apache.oltu.oauth2.common.error.OAuthError;

oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/PasswordValidator.java

@@ -21,7 +21,7 @@
 
 package org.apache.oltu.oauth2.as.validator;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.oltu.oauth2.common.OAuth;
 import org.apache.oltu.oauth2.common.validators.AbstractValidator;

oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/RefreshTokenValidator.java

@@ -22,7 +22,7 @@
 package org.apache.oltu.oauth2.as.validator;
 
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.oltu.oauth2.common.OAuth;
 import org.apache.oltu.oauth2.common.validators.AbstractValidator;

oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/TokenValidator.java

@@ -21,7 +21,7 @@
 
 package org.apache.oltu.oauth2.as.validator;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.oltu.oauth2.common.OAuth;
 import org.apache.oltu.oauth2.common.error.OAuthError;

oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/UnauthenticatedAuthorizationCodeValidator.java

@@ -17,11 +17,11 @@
 
 package org.apache.oltu.oauth2.as.validator;
 
+import jakarta.servlet.http.HttpServletRequest;
+
 import org.apache.oltu.oauth2.common.OAuth;
 import org.apache.oltu.oauth2.common.validators.AbstractValidator;
 
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * Validator that checks for the required fields for an OAuth Token request with the Authorization Code grant type.
  * This validator does NOT enforce client authentication.

oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/UnauthenticatedPasswordValidator.java

@@ -21,7 +21,7 @@
 
 package org.apache.oltu.oauth2.as.validator;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.oltu.oauth2.common.OAuth;
 import org.apache.oltu.oauth2.common.validators.AbstractValidator;

oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/UnauthenticatedRefreshTokenValidator.java

@@ -17,11 +17,11 @@
 
 package org.apache.oltu.oauth2.as.validator;
 
+import jakarta.servlet.http.HttpServletRequest;
+
 import org.apache.oltu.oauth2.common.OAuth;
 import org.apache.oltu.oauth2.common.validators.AbstractValidator;
 
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * Validator that checks for the required fields in an OAuth Token request with the Refresh token grant type.
  * This validator does NOT enforce client authentication.

oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/MD5GeneratorTest.java

@@ -21,13 +21,13 @@
 
 package org.apache.oltu.oauth2.as;
 
+import static org.junit.Assert.assertNotNull;
+
 import org.apache.oltu.oauth2.as.issuer.MD5Generator;
 import org.apache.oltu.oauth2.as.issuer.ValueGenerator;
 import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
 import org.junit.Test;
 
-import static org.junit.Assert.assertNotNull;
-
 public class MD5GeneratorTest {
 
     private final ValueGenerator g = new MD5Generator();

oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/OAuthIssuerImplTest.java

@@ -21,13 +21,13 @@
 
 package org.apache.oltu.oauth2.as;
 
+import static org.junit.Assert.assertNotNull;
+
 import org.apache.oltu.oauth2.as.issuer.MD5Generator;
 import org.apache.oltu.oauth2.as.issuer.OAuthIssuer;
 import org.apache.oltu.oauth2.as.issuer.OAuthIssuerImpl;
 import org.junit.Test;
 
-import static org.junit.Assert.assertNotNull;
-
 public class OAuthIssuerImplTest {
     private OAuthIssuer issuer = new OAuthIssuerImpl(new MD5Generator());
 

oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/OAuthRequestTest.java

@@ -21,6 +21,16 @@
 
 package org.apache.oltu.oauth2.as;
 
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+import java.util.Set;
+
 import org.apache.commons.codec.binary.Base64;
 import org.apache.oltu.oauth2.as.request.OAuthAuthzRequest;
 import org.apache.oltu.oauth2.as.request.OAuthRequest;
@@ -34,13 +44,6 @@
 import org.apache.oltu.oauth2.common.utils.OAuthUtils;
 import org.junit.Test;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.Set;
-
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.*;
-
 
 public class OAuthRequestTest {
     public static final String REDIRECT_URI = "http://www.example.com/callback";