Merge pull request #74 from tdrwenski/update-to-jakarta-namespace

Use jakarta namespace
Unidata · Aug 23, 2024 · 0cd2b24 · 0cd2b24
2 parents 1dcaae1 + f4e4479
commit 0cd2b24
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/tds-plugin/src/main/java/thredds/server/metadata/controller/AbstractMetadataController.java b/tds-plugin/src/main/java/thredds/server/metadata/controller/AbstractMetadataController.java
@@ -5,10 +5,10 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.web.context.ServletContextAware;
 

diff --git a/tds-plugin/src/main/java/thredds/server/metadata/controller/IMetadataContoller.java b/tds-plugin/src/main/java/thredds/server/metadata/controller/IMetadataContoller.java
@@ -30,9 +30,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;
 
 /**
  * IMetadataContoller

diff --git a/tds-plugin/src/main/java/thredds/server/metadata/controller/IsoController.java b/tds-plugin/src/main/java/thredds/server/metadata/controller/IsoController.java
@@ -35,9 +35,9 @@
 import java.io.StringWriter;
 import java.io.Writer;
 
-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.beans.factory.annotation.Autowired;

diff --git a/tds-plugin/src/main/java/thredds/server/metadata/controller/NcmlController.java b/tds-plugin/src/main/java/thredds/server/metadata/controller/NcmlController.java
@@ -31,9 +31,9 @@
 import java.io.IOException;
 import java.io.Writer;
 
-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.beans.factory.annotation.Autowired;

diff --git a/tds-plugin/src/main/java/thredds/server/metadata/controller/UddcController.java b/tds-plugin/src/main/java/thredds/server/metadata/controller/UddcController.java
@@ -34,9 +34,9 @@
 import java.io.StringWriter;
 import java.io.Writer;
 
-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.beans.factory.annotation.Autowired;

diff --git a/tds-plugin/src/main/java/thredds/server/metadata/util/DatasetHandlerAdapter.java b/tds-plugin/src/main/java/thredds/server/metadata/util/DatasetHandlerAdapter.java
@@ -31,8 +31,8 @@
 import java.io.FileNotFoundException;
 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 thredds.core.TdsRequestedDataset;
 import thredds.servlet.ServletUtil;

diff --git a/tds-plugin/src/test/java/thredds/server/metadata/NcIsoIT.java b/tds-plugin/src/test/java/thredds/server/metadata/NcIsoIT.java
@@ -9,7 +9,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Properties;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;