File tree Expand file tree Collapse file tree 6 files changed +18
-14
lines changed
src/main/java/apijson/framework Expand file tree Collapse file tree 6 files changed +18
-14
lines changed Original file line number Diff line number Diff line change 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 >
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 >
Original file line number Diff line number Diff line change 3636import java .rmi .ServerException ;
3737import 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
4444import com .alibaba .fastjson .JSONObject ;
4545
Original file line number Diff line number Diff line change 3131import java .util .List ;
3232import java .util .Map ;
3333
34- import javax .servlet .http .HttpSession ;
34+ import jakarta .servlet .http .HttpSession ;
3535
3636import com .alibaba .fastjson .JSONArray ;
3737import com .alibaba .fastjson .JSONObject ;
Original file line number Diff line number Diff line change 1616
1717import java .util .List ;
1818
19- import javax .servlet .http .HttpSession ;
19+ import jakarta .servlet .http .HttpSession ;
2020
2121import apijson .orm .*;
2222import com .alibaba .fastjson .JSONObject ;
Original file line number Diff line number Diff line change 2121import java .util .Map ;
2222import java .util .Set ;
2323
24- import javax .servlet .http .HttpSession ;
24+ import jakarta .servlet .http .HttpSession ;
2525
2626import com .alibaba .fastjson .JSONObject ;
2727
Original file line number Diff line number Diff line change 2222import java .rmi .ServerException ;
2323import java .util .*;
2424
25- import javax .servlet .http .HttpSession ;
25+ import jakarta .servlet .http .HttpSession ;
2626
2727import apijson .column .ColumnUtil ;
2828import apijson .orm .*;
You can’t perform that action at this time.
0 commit comments