Skip to content

Commit 0cd2b24

Browse files
authored
Merge pull request #74 from tdrwenski/update-to-jakarta-namespace
Use jakarta namespace
2 parents 1dcaae1 + f4e4479 commit 0cd2b24

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

tds-plugin/src/main/java/thredds/server/metadata/controller/AbstractMetadataController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import java.net.URI;
66
import java.net.URISyntaxException;
77

8-
import javax.servlet.ServletContext;
9-
import javax.servlet.ServletException;
10-
import javax.servlet.http.HttpServletRequest;
11-
import javax.servlet.http.HttpServletResponse;
8+
import jakarta.servlet.ServletContext;
9+
import jakarta.servlet.ServletException;
10+
import jakarta.servlet.http.HttpServletRequest;
11+
import jakarta.servlet.http.HttpServletResponse;
1212

1313
import org.springframework.web.context.ServletContextAware;
1414

tds-plugin/src/main/java/thredds/server/metadata/controller/IMetadataContoller.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030

3131
import java.io.IOException;
3232

33-
import javax.servlet.ServletException;
34-
import javax.servlet.http.HttpServletRequest;
35-
import javax.servlet.http.HttpServletResponse;
33+
import jakarta.servlet.ServletException;
34+
import jakarta.servlet.http.HttpServletRequest;
35+
import jakarta.servlet.http.HttpServletResponse;
3636

3737
/**
3838
* IMetadataContoller

tds-plugin/src/main/java/thredds/server/metadata/controller/IsoController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
import java.io.StringWriter;
3636
import java.io.Writer;
3737

38-
import javax.servlet.ServletException;
39-
import javax.servlet.http.HttpServletRequest;
40-
import javax.servlet.http.HttpServletResponse;
38+
import jakarta.servlet.ServletException;
39+
import jakarta.servlet.http.HttpServletRequest;
40+
import jakarta.servlet.http.HttpServletResponse;
4141

4242
import org.springframework.beans.factory.InitializingBean;
4343
import org.springframework.beans.factory.annotation.Autowired;

tds-plugin/src/main/java/thredds/server/metadata/controller/NcmlController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
import java.io.IOException;
3232
import java.io.Writer;
3333

34-
import javax.servlet.ServletException;
35-
import javax.servlet.http.HttpServletRequest;
36-
import javax.servlet.http.HttpServletResponse;
34+
import jakarta.servlet.ServletException;
35+
import jakarta.servlet.http.HttpServletRequest;
36+
import jakarta.servlet.http.HttpServletResponse;
3737

3838
import org.springframework.beans.factory.InitializingBean;
3939
import org.springframework.beans.factory.annotation.Autowired;

tds-plugin/src/main/java/thredds/server/metadata/controller/UddcController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
import java.io.StringWriter;
3535
import java.io.Writer;
3636

37-
import javax.servlet.ServletException;
38-
import javax.servlet.http.HttpServletRequest;
39-
import javax.servlet.http.HttpServletResponse;
37+
import jakarta.servlet.ServletException;
38+
import jakarta.servlet.http.HttpServletRequest;
39+
import jakarta.servlet.http.HttpServletResponse;
4040

4141
import org.springframework.beans.factory.InitializingBean;
4242
import org.springframework.beans.factory.annotation.Autowired;

tds-plugin/src/main/java/thredds/server/metadata/util/DatasetHandlerAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import java.io.FileNotFoundException;
3232
import java.io.IOException;
3333

34-
import javax.servlet.http.HttpServletRequest;
35-
import javax.servlet.http.HttpServletResponse;
34+
import jakarta.servlet.http.HttpServletRequest;
35+
import jakarta.servlet.http.HttpServletResponse;
3636

3737
import thredds.core.TdsRequestedDataset;
3838
import thredds.servlet.ServletUtil;

tds-plugin/src/test/java/thredds/server/metadata/NcIsoIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import java.nio.file.Path;
1010
import java.nio.file.Paths;
1111
import java.util.Properties;
12-
import javax.servlet.http.HttpServletResponse;
12+
import jakarta.servlet.http.HttpServletResponse;
1313
import org.junit.BeforeClass;
1414
import org.junit.ClassRule;
1515
import org.junit.Test;

0 commit comments

Comments
 (0)