made changes to upgrade to java 17

cpf-api-app/pom.xml

@@ -153,9 +153,11 @@
       <artifactId>cpf-api-client</artifactId>
       <version>${project.version}</version>
     </dependency>
+
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>5.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -182,10 +184,17 @@
       <version>3.12.1.GA</version>
     </dependency>
     <dependency>
-      <groupId>javax.mail</groupId>
-      <artifactId>mail</artifactId>
-      <version>1.5.0-b01</version>
+      <groupId>com.sun.mail</groupId>
+      <artifactId>jakarta.mail</artifactId>
+      <version>1.6.7</version> <!-- or the latest version available -->
     </dependency>
+    <dependency>
+        <groupId>jakarta.mail</groupId>
+        <artifactId>jakarta.mail-api</artifactId>
+        <version>2.0.0</version> <!-- or the latest version available -->
+        <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
@@ -201,10 +210,11 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>javax.websocket</groupId>
-      <artifactId>javax.websocket-api</artifactId>
-      <version>1.1</version>
+      <groupId>jakarta.websocket</groupId>
+      <artifactId>jakarta.websocket-api</artifactId>
+      <version>2.0.0</version>
       <scope>provided</scope>
     </dependency>
+
   </dependencies>
 </project>

cpf-api-app/src/main/java/ca/bc/gov/open/cpf/api/scheduler/BatchJobService.java

@@ -46,11 +46,11 @@
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.annotation.Resource;
-import javax.mail.internet.MimeMessage;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.websocket.Session;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.websocket.Session;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;

cpf-api-app/src/main/java/ca/bc/gov/open/cpf/api/scheduler/Worker.java

@@ -25,7 +25,7 @@
 import java.util.Set;
 import java.util.TreeMap;
 
-import javax.websocket.Session;
+import jakarta.websocket.Session;
 
 import org.jeometry.common.data.identifier.Identifier;
 

cpf-api-app/src/main/java/ca/bc/gov/open/cpf/api/security/CpfSecurityModuleImport.java

@@ -20,7 +20,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
 
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.PropertyValue;

cpf-api-app/src/main/java/ca/bc/gov/open/cpf/api/security/digest/DigestAuthenticationFilter.java

@@ -18,12 +18,12 @@
 import java.io.IOException;
 import java.util.Map;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

cpf-api-app/src/main/java/ca/bc/gov/open/cpf/api/security/interceptor/LoadUserByConsumerKeyInterceptor.java

@@ -35,13 +35,13 @@
  */
 package ca.bc.gov.open.cpf.api.security.interceptor;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+import org.springframework.web.servlet.HandlerInterceptor;
 
 import ca.bc.gov.open.cpf.api.domain.CpfDataAccessObject;
 import ca.bc.gov.open.cpf.api.domain.UserAccount;
@@ -54,7 +54,7 @@
  * external user name identified in the HTTP request Principal within the
  * specified userAccountClass.
  */
-public class LoadUserByConsumerKeyInterceptor extends HandlerInterceptorAdapter {
+public class LoadUserByConsumerKeyInterceptor implements HandlerInterceptor {
 
   private CpfDataAccessObject dataAccessObject;
 

cpf-api-app/src/main/java/ca/bc/gov/open/cpf/api/security/oauth/HttpRequestMessage.java

@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import net.oauth.OAuth;
 import net.oauth.OAuthMessage;

cpf-api-app/src/main/java/ca/bc/gov/open/cpf/api/security/oauth/OAuthOrDigestProcessingFilterEntryPoint.java

@@ -37,10 +37,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.logging.Log;

cpf-api-app/src/main/java/ca/bc/gov/open/cpf/api/security/oauth/OAuthProcessingFilter.java

@@ -38,9 +38,15 @@
 import java.io.IOException;
 import java.util.Collection;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -86,6 +92,22 @@ public static OAuthMessage getMessage(final HttpServletRequest request, String U
     return new HttpRequestMessage(request, URL);
   }
 
+  @Override
+  public void doFilter(final ServletRequest request, final ServletResponse response,
+    final FilterChain chain) throws IOException, ServletException {
+    try {
+      chain.doFilter(request, response);
+    } catch (final IOException e) {
+      throw e;
+    } catch (final ServletException e) {
+      throw e;
+    } catch (final RuntimeException e) {
+      throw e;
+    } catch (final Error e) {
+      throw e;
+    }
+  }
+
   /** Reconstruct the requested URL, complete with query string (if any). */
   public static String getRequestURL(final HttpServletRequest request) {
     final StringBuffer url = request.getRequestURL();

cpf-api-app/src/main/java/ca/bc/gov/open/cpf/api/security/oauth/OAuthProcessingFilterEntryPoint.java

@@ -37,9 +37,9 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.security.core.AuthenticationException;

cpf-api-app/src/main/java/ca/bc/gov/open/cpf/api/security/service/BaseAuthorizationService.java

@@ -22,7 +22,7 @@
 
 import javax.annotation.PreDestroy;
 
-import org.springframework.beans.factory.annotation.Required;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import ca.bc.gov.open.cpf.api.domain.CpfDataAccessObject;
 import ca.bc.gov.open.cpf.api.domain.UserAccount;
@@ -124,7 +124,7 @@ public void setDataAccessObject(final CpfDataAccessObject dataAccessObject) {
     this.dataAccessObject = dataAccessObject;
   }
 
-  @Required
+  @Autowired
   public void setUserAccountSecurityService(
     final UserAccountSecurityService userAccountSecurityService) {
     this.userAccountSecurityService = userAccountSecurityService;

cpf-api-app/src/main/java/ca/bc/gov/open/cpf/api/security/service/UserAccountByConsumerKeyDetailsService.java

@@ -18,7 +18,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.beans.factory.annotation.Required;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
 import org.springframework.security.authentication.AccountStatusUserDetailsChecker;
 import org.springframework.security.core.AuthenticationException;
@@ -93,14 +93,14 @@ public UserDetails loadUserByUsername(final String username)
     }
   }
 
-  @Required
+  @Autowired
   public void setUserAccountSecurityService(
     final UserAccountSecurityService userAccountSecurityService) {
     this.userAccountSecurityService = userAccountSecurityService;
     this.dataAccessObject = userAccountSecurityService.getDataAccessObject();
   }
 
-  @Required
+  @Autowired
   public void setUserDetailsChecker(final UserDetailsChecker userDetailsChecker) {
     this.userDetailsChecker = userDetailsChecker;
   }

cpf-api-app/src/main/java/ca/bc/gov/open/cpf/api/web/CpfLoggingContextListener.java

@@ -17,9 +17,9 @@
 
 import java.io.File;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 
 import ca.bc.gov.open.cpf.plugin.impl.module.ClassLoaderModule;
 

cpf-api-app/src/main/java/ca/bc/gov/open/cpf/api/web/builder/BatchJobFileUiBuilder.java

@@ -17,8 +17,8 @@
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.jeometry.common.data.identifier.Identifier;
 import org.springframework.stereotype.Controller;

cpf-api-app/src/main/java/ca/bc/gov/open/cpf/api/web/builder/BatchJobRequestExecutionGroupUiBuilder.java

@@ -19,8 +19,8 @@
 import java.util.List;
 import java.util.concurrent.Callable;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;