diff --git a/Model/lib/conifer/roles/conifer/templates/WDK/tomcat_context.xml.j2 b/Model/lib/conifer/roles/conifer/templates/WDK/tomcat_context.xml.j2
index 90d94a07a7..6429616c2b 100644
--- a/Model/lib/conifer/roles/conifer/templates/WDK/tomcat_context.xml.j2
+++ b/Model/lib/conifer/roles/conifer/templates/WDK/tomcat_context.xml.j2
@@ -14,7 +14,7 @@ site_vars file: {{ site_vars }}
     docBase="{{ contextxml_docBase }}"
     privileged="{{ contextxml_privileged|default("false") }}"
     swallowOutput="{{ contextxml_swallowOutput|default("true") }}"
-    allowLinking="{{ contextxml_allowLinking|default("true") }}"
 >
+    <Resources allowLinking="{{ contextxml_allowLinking|default("true") }}" />
     <Parameter name="model" value="{{ contextxml_model }}"/>
 </Context>
diff --git a/Model/pom.xml b/Model/pom.xml
index 847794e4bc..bc97460e2c 100644
--- a/Model/pom.xml
+++ b/Model/pom.xml
@@ -19,8 +19,8 @@
       <artifactId>wsf-client</artifactId>
       <exclusions>
         <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>javax.servlet-api</artifactId>
+          <groupId>jakarta.servlet</groupId>
+          <artifactId>jakarta.servlet-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -146,8 +146,8 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
 
diff --git a/Model/src/main/java/org/gusdb/wdk/controller/ApplicationInitListener.java b/Model/src/main/java/org/gusdb/wdk/controller/ApplicationInitListener.java
index 3f2e5d995f..20d8544d8d 100644
--- a/Model/src/main/java/org/gusdb/wdk/controller/ApplicationInitListener.java
+++ b/Model/src/main/java/org/gusdb/wdk/controller/ApplicationInitListener.java
@@ -1,7 +1,7 @@
 package org.gusdb.wdk.controller;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 
 import org.gusdb.fgputil.web.servlet.HttpServletApplicationContext;
 
diff --git a/Model/src/main/java/org/gusdb/wdk/controller/ContextLookup.java b/Model/src/main/java/org/gusdb/wdk/controller/ContextLookup.java
index 58501846b9..945b0f502b 100644
--- a/Model/src/main/java/org/gusdb/wdk/controller/ContextLookup.java
+++ b/Model/src/main/java/org/gusdb/wdk/controller/ContextLookup.java
@@ -1,8 +1,8 @@
 package org.gusdb.wdk.controller;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 
 import org.glassfish.grizzly.http.server.Request;
 import org.glassfish.grizzly.http.server.Session;
diff --git a/Model/src/main/java/org/gusdb/wdk/controller/filter/HttpHeaderLoggerFilter.java b/Model/src/main/java/org/gusdb/wdk/controller/filter/HttpHeaderLoggerFilter.java
index 9e7025ecc8..f1c221bd3f 100644
--- a/Model/src/main/java/org/gusdb/wdk/controller/filter/HttpHeaderLoggerFilter.java
+++ b/Model/src/main/java/org/gusdb/wdk/controller/filter/HttpHeaderLoggerFilter.java
@@ -7,14 +7,14 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 
 import org.apache.log4j.Logger;
 
diff --git a/Model/src/main/java/org/gusdb/wdk/controller/filter/HttpResponseHeaderLogger.java b/Model/src/main/java/org/gusdb/wdk/controller/filter/HttpResponseHeaderLogger.java
index ea2dd06a03..f4b17c58eb 100644
--- a/Model/src/main/java/org/gusdb/wdk/controller/filter/HttpResponseHeaderLogger.java
+++ b/Model/src/main/java/org/gusdb/wdk/controller/filter/HttpResponseHeaderLogger.java
@@ -7,15 +7,15 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 
 import org.apache.log4j.Logger;
 import org.gusdb.fgputil.FormatUtil;
@@ -139,11 +139,6 @@ public void setStatus(int sc) {
       super.setStatus(sc);
     }
 
-    @Override
-    public void setStatus(int sc, String sm) {
-      _responseStatus = sc;
-      super.setStatus(sc, sm);
-    }
   }
 
   @Override
diff --git a/Model/src/main/java/org/gusdb/wdk/controller/filter/MDCServletFilter.java b/Model/src/main/java/org/gusdb/wdk/controller/filter/MDCServletFilter.java
index 90cb2df84c..9da7422a48 100644
--- a/Model/src/main/java/org/gusdb/wdk/controller/filter/MDCServletFilter.java
+++ b/Model/src/main/java/org/gusdb/wdk/controller/filter/MDCServletFilter.java
@@ -3,14 +3,14 @@
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 
 import org.gusdb.fgputil.logging.ThreadLocalLoggingVars;
 
diff --git a/Model/src/main/java/org/gusdb/wdk/controller/wizard/MapActionFormIfc.java b/Model/src/main/java/org/gusdb/wdk/controller/wizard/MapActionFormIfc.java
index e4de67313f..74a0f7b8f4 100644
--- a/Model/src/main/java/org/gusdb/wdk/controller/wizard/MapActionFormIfc.java
+++ b/Model/src/main/java/org/gusdb/wdk/controller/wizard/MapActionFormIfc.java
@@ -2,7 +2,7 @@
 
 import java.util.Map;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 public interface MapActionFormIfc {
 
diff --git a/Model/src/main/java/org/gusdb/wdk/controller/wizard/StageHandler.java b/Model/src/main/java/org/gusdb/wdk/controller/wizard/StageHandler.java
index 883fbbc815..c2812cebdf 100644
--- a/Model/src/main/java/org/gusdb/wdk/controller/wizard/StageHandler.java
+++ b/Model/src/main/java/org/gusdb/wdk/controller/wizard/StageHandler.java
@@ -2,8 +2,8 @@
 
 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.gusdb.wdk.model.WdkModel;
 
diff --git a/Model/src/main/java/org/gusdb/wdk/errors/ValueMaps.java b/Model/src/main/java/org/gusdb/wdk/errors/ValueMaps.java
index 41ac915315..8f4b48a674 100644
--- a/Model/src/main/java/org/gusdb/wdk/errors/ValueMaps.java
+++ b/Model/src/main/java/org/gusdb/wdk/errors/ValueMaps.java
@@ -4,9 +4,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 
 public class ValueMaps {
 
diff --git a/Model/src/main/java/org/gusdb/wdk/jmx/BeanBase.java b/Model/src/main/java/org/gusdb/wdk/jmx/BeanBase.java
index dd885cc66c..18f9a8a217 100644
--- a/Model/src/main/java/org/gusdb/wdk/jmx/BeanBase.java
+++ b/Model/src/main/java/org/gusdb/wdk/jmx/BeanBase.java
@@ -1,6 +1,6 @@
 package org.gusdb.wdk.jmx;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.gusdb.wdk.model.Utilities;
 import org.gusdb.wdk.model.WdkModel;
diff --git a/Model/src/main/java/org/gusdb/wdk/jmx/ContextThreadLocal.java b/Model/src/main/java/org/gusdb/wdk/jmx/ContextThreadLocal.java
index b1f3ba67a1..6909962c8a 100644
--- a/Model/src/main/java/org/gusdb/wdk/jmx/ContextThreadLocal.java
+++ b/Model/src/main/java/org/gusdb/wdk/jmx/ContextThreadLocal.java
@@ -1,6 +1,6 @@
 package org.gusdb.wdk.jmx;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 /**
  * A ThreadLocal to store the ServletContext for the webapp. The
diff --git a/Model/src/main/java/org/gusdb/wdk/jmx/JmxInitListener.java b/Model/src/main/java/org/gusdb/wdk/jmx/JmxInitListener.java
index 4f5d7b508a..aac8b44a8b 100644
--- a/Model/src/main/java/org/gusdb/wdk/jmx/JmxInitListener.java
+++ b/Model/src/main/java/org/gusdb/wdk/jmx/JmxInitListener.java
@@ -1,8 +1,8 @@
 package org.gusdb.wdk.jmx;
 
-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 org.apache.log4j.Logger;
 import org.gusdb.fgputil.logging.ThreadLocalLoggingVars;
diff --git a/Model/src/main/java/org/gusdb/wdk/jmx/MBeanRegistration.java b/Model/src/main/java/org/gusdb/wdk/jmx/MBeanRegistration.java
index 54234c53f8..47c4d3689d 100644
--- a/Model/src/main/java/org/gusdb/wdk/jmx/MBeanRegistration.java
+++ b/Model/src/main/java/org/gusdb/wdk/jmx/MBeanRegistration.java
@@ -16,7 +16,7 @@
 import javax.management.MalformedObjectNameException;
 import javax.management.NotCompliantMBeanException;
 import javax.management.ObjectName;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.apache.log4j.Logger;
 import org.gusdb.fgputil.MapBuilder;
@@ -230,7 +230,7 @@ private String getContextPath() throws ContextResolutionException {
     }
     else {
       // hack for old servlet API: use the name of the tempdir
-      String tmpdir = ((java.io.File) sc.getAttribute("javax.servlet.context.tempdir")).getName();
+      String tmpdir = ((java.io.File) sc.getAttribute("jakarta.servlet.context.tempdir")).getName();
       contextName = "/" + tmpdir;
     }
 
diff --git a/Model/src/main/java/org/gusdb/wdk/model/fix/QuestionComparison.java b/Model/src/main/java/org/gusdb/wdk/model/fix/QuestionComparison.java
index 0892830c98..6215999c6f 100644
--- a/Model/src/main/java/org/gusdb/wdk/model/fix/QuestionComparison.java
+++ b/Model/src/main/java/org/gusdb/wdk/model/fix/QuestionComparison.java
@@ -17,11 +17,11 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.gusdb.fgputil.IoUtil;
 import org.gusdb.fgputil.Tuples.ThreeTuple;
diff --git a/Model/src/main/java/org/gusdb/wdk/model/query/param/FilterParamNewStableValue.java b/Model/src/main/java/org/gusdb/wdk/model/query/param/FilterParamNewStableValue.java
old mode 100755
new mode 100644
diff --git a/Model/src/main/java/org/gusdb/wdk/model/report/reporter/AnswerDetailsReporter.java b/Model/src/main/java/org/gusdb/wdk/model/report/reporter/AnswerDetailsReporter.java
index 4bf5d313ef..99241afb53 100644
--- a/Model/src/main/java/org/gusdb/wdk/model/report/reporter/AnswerDetailsReporter.java
+++ b/Model/src/main/java/org/gusdb/wdk/model/report/reporter/AnswerDetailsReporter.java
@@ -5,8 +5,8 @@
 import java.io.OutputStream;
 import java.util.Map;
 
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.core.MediaType;
 
 import org.gusdb.fgputil.SortDirectionSpec;
 import org.gusdb.fgputil.functional.FunctionalInterfaces.Procedure;
diff --git a/Service/pom.xml b/Service/pom.xml
index 85c1b2a16f..8839fcd628 100644
--- a/Service/pom.xml
+++ b/Service/pom.xml
@@ -30,8 +30,8 @@
       <artifactId>wdk-model</artifactId>
       <exclusions>
         <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>javax.servlet-api</artifactId>
+          <groupId>jakarta.servlet</groupId>
+          <artifactId>jakarta.servlet-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -71,8 +71,8 @@
       <artifactId>jersey-container-servlet</artifactId>
       <exclusions>
         <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>javax.servlet-api</artifactId>
+          <groupId>jakarta.servlet</groupId>
+          <artifactId>jakarta.servlet-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -112,8 +112,8 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
 
diff --git a/Service/src/main/java/org/gusdb/wdk/server/Server.java b/Service/src/main/java/org/gusdb/wdk/server/Server.java
index 0a0f73a282..8e44df8231 100644
--- a/Service/src/main/java/org/gusdb/wdk/server/Server.java
+++ b/Service/src/main/java/org/gusdb/wdk/server/Server.java
@@ -2,7 +2,7 @@
 
 import java.net.URI;
 
-import javax.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.glassfish.jersey.server.ResourceConfig;
 import org.gusdb.fgputil.FormatUtil;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/FileRanges.java b/Service/src/main/java/org/gusdb/wdk/service/FileRanges.java
index 1e834987af..522fa06ed3 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/FileRanges.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/FileRanges.java
@@ -8,10 +8,10 @@
 import java.io.IOException;
 import java.nio.file.Path;
 
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.apache.log4j.Logger;
 import org.gusdb.fgputil.FileChunkInputStream;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/WdkServiceApplication.java b/Service/src/main/java/org/gusdb/wdk/service/WdkServiceApplication.java
index 891ae04041..95ba02607a 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/WdkServiceApplication.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/WdkServiceApplication.java
@@ -3,7 +3,7 @@
 import java.util.Set;
 import java.util.function.Predicate;
 
-import javax.ws.rs.core.Application;
+import jakarta.ws.rs.core.Application;
 
 import org.glassfish.jersey.client.filter.EncodingFeature;
 import org.glassfish.jersey.media.multipart.MultiPartFeature;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/annotation/PATCH.java b/Service/src/main/java/org/gusdb/wdk/service/annotation/PATCH.java
index a15097a2c4..092d53a423 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/annotation/PATCH.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/annotation/PATCH.java
@@ -6,7 +6,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.ws.rs.HttpMethod;
+import jakarta.ws.rs.HttpMethod;
 
 /**
  * Indicates that the annotated method responds to HTTP PATCH requests.  Needed
diff --git a/Service/src/main/java/org/gusdb/wdk/service/filter/CheckLoginFilter.java b/Service/src/main/java/org/gusdb/wdk/service/filter/CheckLoginFilter.java
index 9ca1e67706..563a8ce888 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/filter/CheckLoginFilter.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/filter/CheckLoginFilter.java
@@ -2,23 +2,23 @@
 
 import java.io.IOException;
 
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.NotAuthorizedException;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.NewCookie;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.NotAuthorizedException;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Cookie;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.apache.log4j.Logger;
 import org.glassfish.grizzly.http.server.Request;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/filter/ClientCacheExpirationFilter.java b/Service/src/main/java/org/gusdb/wdk/service/filter/ClientCacheExpirationFilter.java
index e797061bdc..bc27d60e09 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/filter/ClientCacheExpirationFilter.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/filter/ClientCacheExpirationFilter.java
@@ -4,14 +4,14 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Priority;
-import javax.servlet.ServletContext;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
+import jakarta.annotation.Priority;
+import jakarta.servlet.ServletContext;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.gusdb.wdk.controller.ContextLookup;
 
diff --git a/Service/src/main/java/org/gusdb/wdk/service/filter/LoggingContextFilter.java b/Service/src/main/java/org/gusdb/wdk/service/filter/LoggingContextFilter.java
index 71fe96a65e..b3150522cf 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/filter/LoggingContextFilter.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/filter/LoggingContextFilter.java
@@ -3,16 +3,16 @@
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.container.PreMatching;
-import javax.ws.rs.ext.WriterInterceptor;
-import javax.ws.rs.ext.WriterInterceptorContext;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.container.PreMatching;
+import jakarta.ws.rs.ext.WriterInterceptor;
+import jakarta.ws.rs.ext.WriterInterceptorContext;
 
 import org.glassfish.grizzly.http.server.Request;
 import org.gusdb.fgputil.logging.ThreadLocalLoggingVars;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/filter/MethodRewritingFilter.java b/Service/src/main/java/org/gusdb/wdk/service/filter/MethodRewritingFilter.java
index 38fce95f3d..459b37d5a5 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/filter/MethodRewritingFilter.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/filter/MethodRewritingFilter.java
@@ -4,10 +4,10 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.Priority;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.container.PreMatching;
+import jakarta.annotation.Priority;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.container.PreMatching;
 
 import org.apache.log4j.Logger;
 
diff --git a/Service/src/main/java/org/gusdb/wdk/service/filter/PrometheusFilter.java b/Service/src/main/java/org/gusdb/wdk/service/filter/PrometheusFilter.java
index 5d389dc1e1..ed35968e27 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/filter/PrometheusFilter.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/filter/PrometheusFilter.java
@@ -2,11 +2,11 @@
 
 import java.util.List;
 
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.ext.Provider;
 
 import org.glassfish.jersey.server.ContainerRequest;
 import org.glassfish.jersey.uri.UriTemplate;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/filter/RequestLoggingFilter.java b/Service/src/main/java/org/gusdb/wdk/service/filter/RequestLoggingFilter.java
index f0637470ee..cebcbecb0e 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/filter/RequestLoggingFilter.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/filter/RequestLoggingFilter.java
@@ -9,18 +9,18 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import javax.annotation.Priority;
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.ext.WriterInterceptor;
-import javax.ws.rs.ext.WriterInterceptorContext;
+import jakarta.annotation.Priority;
+import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.ext.WriterInterceptor;
+import jakarta.ws.rs.ext.WriterInterceptorContext;
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/provider/ExceptionMapper.java b/Service/src/main/java/org/gusdb/wdk/service/provider/ExceptionMapper.java
index 6413fbd5bc..32058e3922 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/provider/ExceptionMapper.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/provider/ExceptionMapper.java
@@ -2,18 +2,18 @@
 
 import static org.gusdb.wdk.service.formatter.ValidationFormatter.getValidationBundleJson;
 
-import javax.inject.Inject;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.ext.Provider;
+import jakarta.inject.Inject;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.ext.Provider;
 
 import org.apache.log4j.Logger;
 import org.glassfish.grizzly.http.server.Request;
@@ -37,7 +37,7 @@
 import org.json.JSONObject;
 
 @Provider
-public class ExceptionMapper implements javax.ws.rs.ext.ExceptionMapper<Exception> {
+public class ExceptionMapper implements jakarta.ws.rs.ext.ExceptionMapper<Exception> {
 
   private static final Logger LOG = Logger.getLogger(ExceptionMapper.class);
 
@@ -49,10 +49,10 @@ public class ExceptionMapper implements javax.ws.rs.ext.ExceptionMapper<Exceptio
   private ServletContext _servletContext;
 
   @Inject
-  private javax.inject.Provider<HttpServletRequest> _servletRequest;
+  private jakarta.inject.Provider<HttpServletRequest> _servletRequest;
 
   @Inject
-  private javax.inject.Provider<Request> _grizzlyRequest;
+  private jakarta.inject.Provider<Request> _grizzlyRequest;
 
   @Override
   public Response toResponse(Exception e) {
diff --git a/Service/src/main/java/org/gusdb/wdk/service/provider/JsonSchemaProvider.java b/Service/src/main/java/org/gusdb/wdk/service/provider/JsonSchemaProvider.java
index 21a490cee2..a344c888a5 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/provider/JsonSchemaProvider.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/provider/JsonSchemaProvider.java
@@ -12,18 +12,18 @@
 import java.util.Arrays;
 import java.util.Optional;
 
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.InternalServerErrorException;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.container.ResourceInfo;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.InternalServerErrorException;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.container.ResourceInfo;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.ext.MessageBodyReader;
+import jakarta.ws.rs.ext.MessageBodyWriter;
+import jakarta.ws.rs.ext.Provider;
 
 import org.gusdb.fgputil.functional.Functions;
 import org.gusdb.wdk.service.annotation.InSchema;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/request/ParamValueSetRequest.java b/Service/src/main/java/org/gusdb/wdk/service/request/ParamValueSetRequest.java
index e62d249c03..1683fbb6f0 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/request/ParamValueSetRequest.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/request/ParamValueSetRequest.java
@@ -4,7 +4,7 @@
 import java.util.Map.Entry;
 import java.util.Optional;
 
-import javax.ws.rs.BadRequestException;
+import jakarta.ws.rs.BadRequestException;
 
 import org.gusdb.fgputil.Tuples.TwoTuple;
 import org.gusdb.fgputil.json.JsonUtil;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/request/user/BasketRequests.java b/Service/src/main/java/org/gusdb/wdk/service/request/user/BasketRequests.java
index 5820eac6f0..74e27a7b87 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/request/user/BasketRequests.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/request/user/BasketRequests.java
@@ -5,7 +5,7 @@
 import java.util.Collection;
 import java.util.Optional;
 
-import javax.ws.rs.NotFoundException;
+import jakarta.ws.rs.NotFoundException;
 
 import org.gusdb.fgputil.validation.ValidObjectFactory.RunnableObj;
 import org.gusdb.fgputil.validation.ValidationLevel;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/request/user/dataset/DatasetRequestProcessor.java b/Service/src/main/java/org/gusdb/wdk/service/request/user/dataset/DatasetRequestProcessor.java
index dd41417108..1fc94ec840 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/request/user/dataset/DatasetRequestProcessor.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/request/user/dataset/DatasetRequestProcessor.java
@@ -15,7 +15,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
 
 import org.apache.log4j.Logger;
 import org.gusdb.fgputil.client.ClientUtil;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/AbstractWdkService.java b/Service/src/main/java/org/gusdb/wdk/service/service/AbstractWdkService.java
index e27d4760b0..98401aabcc 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/AbstractWdkService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/AbstractWdkService.java
@@ -9,16 +9,16 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.StreamingOutput;
-import javax.ws.rs.core.UriInfo;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Cookie;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.StreamingOutput;
+import jakarta.ws.rs.core.UriInfo;
 
 import org.apache.log4j.Logger;
 import org.glassfish.grizzly.http.server.Request;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/AnswerService.java b/Service/src/main/java/org/gusdb/wdk/service/service/AnswerService.java
index 83deb7d4de..d7096c8ba9 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/AnswerService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/AnswerService.java
@@ -7,22 +7,22 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.StreamingOutput;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.StreamingOutput;
+import jakarta.ws.rs.core.UriInfo;
 
 import org.apache.log4j.Logger;
 import org.gusdb.fgputil.FormatUtil;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/ClientErrorReportingService.java b/Service/src/main/java/org/gusdb/wdk/service/service/ClientErrorReportingService.java
index ba0896f5d9..4a0018f04f 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/ClientErrorReportingService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/ClientErrorReportingService.java
@@ -1,10 +1,10 @@
 package org.gusdb.wdk.service.service;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.gusdb.fgputil.events.Events;
 import org.gusdb.wdk.errors.ClientErrorBundle;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/OntologyService.java b/Service/src/main/java/org/gusdb/wdk/service/service/OntologyService.java
index 92e1ff7630..5e6fc84b28 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/OntologyService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/OntologyService.java
@@ -3,15 +3,15 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.log4j.Logger;
 import org.gusdb.fgputil.json.JsonUtil;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/ProjectService.java b/Service/src/main/java/org/gusdb/wdk/service/service/ProjectService.java
index 23b0154baf..1dd0758755 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/ProjectService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/ProjectService.java
@@ -5,12 +5,12 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.gusdb.fgputil.Timer;
 import org.gusdb.wdk.model.WdkModelException;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/PublicStrategyService.java b/Service/src/main/java/org/gusdb/wdk/service/service/PublicStrategyService.java
index 52b1faee3c..e30a71b23b 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/PublicStrategyService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/PublicStrategyService.java
@@ -4,13 +4,13 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.gusdb.fgputil.FormatUtil;
 import org.gusdb.fgputil.Tuples.TwoTuple;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/QuestionService.java b/Service/src/main/java/org/gusdb/wdk/service/service/QuestionService.java
index fc80bf44be..8d3fb4edc2 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/QuestionService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/QuestionService.java
@@ -11,14 +11,14 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 import org.apache.log4j.Logger;
 import org.gusdb.fgputil.MapBuilder;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/RecordService.java b/Service/src/main/java/org/gusdb/wdk/service/service/RecordService.java
index cb66df3959..ffcc3b1244 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/RecordService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/RecordService.java
@@ -8,16 +8,16 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.log4j.Logger;
 import org.gusdb.fgputil.Tuples.TwoTuple;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/SampleService.java b/Service/src/main/java/org/gusdb/wdk/service/service/SampleService.java
index f124c78f21..6c32095eb4 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/SampleService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/SampleService.java
@@ -7,20 +7,20 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.Response.Status;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.apache.log4j.Logger;
 import org.gusdb.fgputil.json.JsonType;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/SessionService.java b/Service/src/main/java/org/gusdb/wdk/service/service/SessionService.java
index 8f52c70a19..22968eaf57 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/SessionService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/SessionService.java
@@ -7,17 +7,17 @@
 import java.util.Set;
 import java.util.UUID;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.NewCookie;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
 
 import org.apache.log4j.Logger;
 import org.gusdb.fgputil.EncryptionUtil;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/SystemService.java b/Service/src/main/java/org/gusdb/wdk/service/service/SystemService.java
index dd81cbe20e..528880a927 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/SystemService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/SystemService.java
@@ -16,14 +16,14 @@
 import io.prometheus.client.exporter.common.TextFormat;
 
 import javax.sql.DataSource;
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.StreamingOutput;
 
 import java.io.OutputStreamWriter;
 import java.text.DateFormat;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/TemporaryFileService.java b/Service/src/main/java/org/gusdb/wdk/service/service/TemporaryFileService.java
index 3fe7836a6a..a768269f0b 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/TemporaryFileService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/TemporaryFileService.java
@@ -10,14 +10,14 @@
 import java.util.Optional;
 import java.util.function.Function;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.glassfish.jersey.media.multipart.FormDataParam;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/TemporaryResultService.java b/Service/src/main/java/org/gusdb/wdk/service/service/TemporaryResultService.java
index c9ed3d22d4..2534cde8f7 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/TemporaryResultService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/TemporaryResultService.java
@@ -7,15 +7,15 @@
 import static org.gusdb.wdk.core.api.JsonKeys.SEARCH_NAME;
 import static org.gusdb.wdk.core.api.JsonKeys.STEP_ID;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.gusdb.fgputil.Tuples.TwoTuple;
 import org.gusdb.fgputil.validation.ValidObjectFactory.RunnableObj;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/XmlAnswerService.java b/Service/src/main/java/org/gusdb/wdk/service/service/XmlAnswerService.java
index 57cd40ba32..d6e5470b89 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/XmlAnswerService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/XmlAnswerService.java
@@ -1,12 +1,12 @@
 package org.gusdb.wdk.service.service;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.gusdb.wdk.model.WdkModelException;
 import org.gusdb.wdk.model.xml.XmlAnswerValue;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/search/ColumnFilterService.java b/Service/src/main/java/org/gusdb/wdk/service/service/search/ColumnFilterService.java
index 051bc01b58..0f6ea29875 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/search/ColumnFilterService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/search/ColumnFilterService.java
@@ -2,12 +2,12 @@
 
 import static java.lang.String.format;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 import org.gusdb.wdk.model.WdkModelException;
 import org.gusdb.wdk.model.columntool.ColumnToolFactory;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/search/ColumnReporterService.java b/Service/src/main/java/org/gusdb/wdk/service/service/search/ColumnReporterService.java
index dc2ce835df..e259d8e710 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/search/ColumnReporterService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/search/ColumnReporterService.java
@@ -7,15 +7,15 @@
 import static org.gusdb.wdk.model.user.StepContainer.emptyContainer;
 import static org.gusdb.wdk.service.service.AnswerService.REPORT_NAME_PATH_PARAM;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.StreamingOutput;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.StreamingOutput;
 
 import org.gusdb.fgputil.validation.ValidObjectFactory.RunnableObj;
 import org.gusdb.wdk.core.api.JsonKeys;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/search/ColumnService.java b/Service/src/main/java/org/gusdb/wdk/service/service/search/ColumnService.java
index c552ae873b..8ed2a9cf16 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/search/ColumnService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/search/ColumnService.java
@@ -1,12 +1,12 @@
 package org.gusdb.wdk.service.service.search;
 
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
 
 import org.gusdb.wdk.service.formatter.AttributeFieldFormatter;
 import org.gusdb.wdk.service.service.AbstractWdkService;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/user/BasketService.java b/Service/src/main/java/org/gusdb/wdk/service/service/user/BasketService.java
index 8c8bf99265..a96b95b3af 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/user/BasketService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/user/BasketService.java
@@ -9,17 +9,17 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.StreamingOutput;
 
 import org.gusdb.fgputil.Tuples.TwoTuple;
 import org.gusdb.fgputil.json.JsonIterators;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/user/DatasetService.java b/Service/src/main/java/org/gusdb/wdk/service/service/user/DatasetService.java
index f6007d0d94..a446b8ce69 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/user/DatasetService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/user/DatasetService.java
@@ -2,17 +2,17 @@
 
 import java.io.IOException;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.StreamingOutput;
 
 import org.gusdb.fgputil.IoUtil;
 import org.gusdb.wdk.core.api.JsonKeys;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/user/FavoritesService.java b/Service/src/main/java/org/gusdb/wdk/service/service/user/FavoritesService.java
index fe0eb36351..b18ba6072f 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/user/FavoritesService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/user/FavoritesService.java
@@ -3,17 +3,17 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.log4j.Logger;
 import org.gusdb.fgputil.json.JsonIterators;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/user/PreferenceService.java b/Service/src/main/java/org/gusdb/wdk/service/service/user/PreferenceService.java
index c7286dc28f..bf3119b9af 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/user/PreferenceService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/user/PreferenceService.java
@@ -1,13 +1,13 @@
 package org.gusdb.wdk.service.service.user;
 
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.gusdb.wdk.core.api.JsonKeys;
 import org.gusdb.wdk.model.WdkModelException;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/user/ProfileService.java b/Service/src/main/java/org/gusdb/wdk/service/service/user/ProfileService.java
index f2bdd3c467..cab5fe779f 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/user/ProfileService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/user/ProfileService.java
@@ -2,15 +2,15 @@
 
 import java.util.Optional;
 
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.gusdb.oauth2.exception.InvalidPropertiesException;
 import org.gusdb.wdk.model.WdkModelException;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/user/StepAnalysisFormService.java b/Service/src/main/java/org/gusdb/wdk/service/service/user/StepAnalysisFormService.java
index 02b120f9bd..e2cd73836b 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/user/StepAnalysisFormService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/user/StepAnalysisFormService.java
@@ -14,13 +14,13 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 import org.gusdb.fgputil.MapBuilder;
 import org.gusdb.fgputil.Named.NamedObject;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/user/StepAnalysisInstanceService.java b/Service/src/main/java/org/gusdb/wdk/service/service/user/StepAnalysisInstanceService.java
index 7b0830a9a6..ee9156d133 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/user/StepAnalysisInstanceService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/user/StepAnalysisInstanceService.java
@@ -10,18 +10,18 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.log4j.Logger;
 import org.glassfish.jersey.media.multipart.ContentDisposition;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/user/StepAnalysisLookupMixin.java b/Service/src/main/java/org/gusdb/wdk/service/service/user/StepAnalysisLookupMixin.java
index 35d169ba6f..e26128479b 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/user/StepAnalysisLookupMixin.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/user/StepAnalysisLookupMixin.java
@@ -2,8 +2,8 @@
 
 import java.util.Optional;
 
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.NotFoundException;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.NotFoundException;
 
 import org.gusdb.fgputil.validation.ValidationLevel;
 import org.gusdb.fgputil.validation.ValidObjectFactory.RunnableObj;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/user/StepService.java b/Service/src/main/java/org/gusdb/wdk/service/service/user/StepService.java
index dd08392ffb..6222f81c10 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/user/StepService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/user/StepService.java
@@ -8,21 +8,21 @@
 import java.util.Date;
 import java.util.Optional;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.StreamingOutput;
 
 import org.apache.log4j.Logger;
 import org.gusdb.fgputil.Timer;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/user/StrategyService.java b/Service/src/main/java/org/gusdb/wdk/service/service/user/StrategyService.java
index f4f04ac2b1..f3c69b5a12 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/user/StrategyService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/user/StrategyService.java
@@ -16,19 +16,19 @@
 import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.log4j.Logger;
 import org.gusdb.fgputil.Tuples.TwoTuple;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/user/UserDatasetService.java b/Service/src/main/java/org/gusdb/wdk/service/service/user/UserDatasetService.java
index 92d3e8d0a3..56398147aa 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/user/UserDatasetService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/user/UserDatasetService.java
@@ -14,22 +14,22 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.StreamingOutput;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.StreamingOutput;
 
 import org.apache.log4j.Logger;
 import org.gusdb.fgputil.FormatUtil;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/user/UserService.java b/Service/src/main/java/org/gusdb/wdk/service/service/user/UserService.java
index 005df36dc5..23e3553b7f 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/user/UserService.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/user/UserService.java
@@ -1,9 +1,9 @@
 package org.gusdb.wdk.service.service.user;
 
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
 
 import org.gusdb.fgputil.FormatUtil;
 import org.gusdb.fgputil.validation.ValidObjectFactory.RunnableObj;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/service/user/UserUtilityServices.java b/Service/src/main/java/org/gusdb/wdk/service/service/user/UserUtilityServices.java
index c6282e63fc..1dc0e425ec 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/service/user/UserUtilityServices.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/service/user/UserUtilityServices.java
@@ -7,12 +7,12 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.gusdb.fgputil.functional.Functions;
 import org.gusdb.fgputil.json.JsonIterators;
diff --git a/Service/src/main/java/org/gusdb/wdk/service/statustype/MethodNotAllowedStatusType.java b/Service/src/main/java/org/gusdb/wdk/service/statustype/MethodNotAllowedStatusType.java
index 71130a429a..8a70018244 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/statustype/MethodNotAllowedStatusType.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/statustype/MethodNotAllowedStatusType.java
@@ -1,7 +1,7 @@
 package org.gusdb.wdk.service.statustype;
 
-import javax.ws.rs.core.Response.Status.Family;
-import javax.ws.rs.core.Response.StatusType;
+import jakarta.ws.rs.core.Response.Status.Family;
+import jakarta.ws.rs.core.Response.StatusType;
 
 /**
  * Extending StatusType to accommodate the http status code of 405.  This is
diff --git a/Service/src/main/java/org/gusdb/wdk/service/statustype/MultipleChoicesStatusType.java b/Service/src/main/java/org/gusdb/wdk/service/statustype/MultipleChoicesStatusType.java
index 134be6291a..00f126d416 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/statustype/MultipleChoicesStatusType.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/statustype/MultipleChoicesStatusType.java
@@ -1,7 +1,7 @@
 package org.gusdb.wdk.service.statustype;
 
-import javax.ws.rs.core.Response.Status.Family;
-import javax.ws.rs.core.Response.StatusType;
+import jakarta.ws.rs.core.Response.Status.Family;
+import jakarta.ws.rs.core.Response.StatusType;
 
 /**
  * Extending StatusType to accommodate the http status code of 300.  This is
diff --git a/Service/src/main/java/org/gusdb/wdk/service/statustype/UnprocessableEntityStatusType.java b/Service/src/main/java/org/gusdb/wdk/service/statustype/UnprocessableEntityStatusType.java
index e02445bb2c..b194d7b39e 100644
--- a/Service/src/main/java/org/gusdb/wdk/service/statustype/UnprocessableEntityStatusType.java
+++ b/Service/src/main/java/org/gusdb/wdk/service/statustype/UnprocessableEntityStatusType.java
@@ -1,7 +1,7 @@
 package org.gusdb.wdk.service.statustype;
 
-import javax.ws.rs.core.Response.Status.Family;
-import javax.ws.rs.core.Response.StatusType;
+import jakarta.ws.rs.core.Response.Status.Family;
+import jakarta.ws.rs.core.Response.StatusType;
 
 /**
  * Extending StatusType to accommodate the http status code of 422.  This is
diff --git a/build.xml b/build.xml
old mode 100755
new mode 100644
diff --git a/psu.xml b/psu.xml
old mode 100755
new mode 100644