Skip to content

Commit 1114898

Browse files
committed
6.2.0 版本 javax.servlet-api 升级 jakarta.servlet-api jdk 升级为 17
1 parent 550fd94 commit 1114898

File tree

6 files changed

+18
-14
lines changed

6 files changed

+18
-14
lines changed

pom.xml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,18 @@
1414
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
17-
<java.version>1.8</java.version>
17+
<java.version>17</java.version>
18+
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
19+
<maven.compiler.source>17</maven.compiler.source>
20+
<maven.compiler.target>17</maven.compiler.target>
1821
</properties>
1922

2023
<dependencies>
2124
<dependency>
22-
<groupId>javax.servlet</groupId>
23-
<artifactId>javax.servlet-api</artifactId>
24-
<version>4.0.1</version>
25+
<groupId>jakarta.servlet</groupId>
26+
<artifactId>jakarta.servlet-api</artifactId>
27+
<version>6.0.0</version>
28+
<scope>provided</scope>
2529
</dependency>
2630

2731
<dependency>
@@ -78,8 +82,8 @@
7882
<artifactId>maven-compiler-plugin</artifactId>
7983
<version>3.8.1</version>
8084
<configuration>
81-
<source>1.8</source>
82-
<target>1.8</target>
85+
<source>17</source>
86+
<target>17</target>
8387
</configuration>
8488
</plugin>
8589
</plugins>

src/main/java/apijson/framework/APIJSONController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
import java.rmi.ServerException;
3737
import java.util.Map;
3838

39-
import javax.servlet.AsyncContext;
40-
import javax.servlet.ServletResponse;
41-
import javax.servlet.http.HttpServletRequest;
42-
import javax.servlet.http.HttpSession;
39+
import jakarta.servlet.AsyncContext;
40+
import jakarta.servlet.ServletResponse;
41+
import jakarta.servlet.http.HttpServletRequest;
42+
import jakarta.servlet.http.HttpSession;
4343

4444
import com.alibaba.fastjson.JSONObject;
4545

src/main/java/apijson/framework/APIJSONFunctionParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import java.util.List;
3232
import java.util.Map;
3333

34-
import javax.servlet.http.HttpSession;
34+
import jakarta.servlet.http.HttpSession;
3535

3636
import com.alibaba.fastjson.JSONArray;
3737
import com.alibaba.fastjson.JSONObject;

src/main/java/apijson/framework/APIJSONObjectParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import java.util.List;
1818

19-
import javax.servlet.http.HttpSession;
19+
import jakarta.servlet.http.HttpSession;
2020

2121
import apijson.orm.*;
2222
import com.alibaba.fastjson.JSONObject;

src/main/java/apijson/framework/APIJSONParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.Map;
2222
import java.util.Set;
2323

24-
import javax.servlet.http.HttpSession;
24+
import jakarta.servlet.http.HttpSession;
2525

2626
import com.alibaba.fastjson.JSONObject;
2727

src/main/java/apijson/framework/APIJSONVerifier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.rmi.ServerException;
2323
import java.util.*;
2424

25-
import javax.servlet.http.HttpSession;
25+
import jakarta.servlet.http.HttpSession;
2626

2727
import apijson.column.ColumnUtil;
2828
import apijson.orm.*;

0 commit comments

Comments
 (0)