Skip to content

Commit 2bc6075

Browse files
basilbasil
committed
Jakarta EE 9 transition
1 parent 39fd994 commit 2bc6075

File tree

97 files changed

+310
-268
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+310
-268
lines changed

‎core/example/src/example/Book.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.kohsuke.stapler.StaplerRequest;
44
import org.kohsuke.stapler.StaplerResponse;
55

6-
import javax.servlet.ServletException;
6+
import jakarta.servlet.ServletException;
77
import java.io.IOException;
88

99
/**

‎core/example/src/example/BookStore.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.kohsuke.stapler.StaplerRequest;
44
import org.kohsuke.stapler.StaplerResponse;
55

6-
import javax.servlet.ServletException;
6+
import jakarta.servlet.ServletException;
77
import java.io.IOException;
88
import java.util.Hashtable;
99
import java.util.Map;

‎core/example/src/example/WebAppMain.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import org.kohsuke.stapler.Stapler;
44

5-
import javax.servlet.ServletContextListener;
6-
import javax.servlet.ServletContextEvent;
5+
import jakarta.servlet.ServletContextListener;
6+
import jakarta.servlet.ServletContextEvent;
77

88
/**
99
* This class is invoked by the container at the beginning

‎core/maven-example/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616
<version>1.253</version>
1717
</dependency>
1818
<dependency>
19-
<groupId>javax.servlet.jsp.jstl</groupId>
20-
<artifactId>javax.servlet.jsp.jstl-api</artifactId>
21-
<version>1.2.1</version>
19+
<groupId>jakarta.servlet.jsp.jstl</groupId>
20+
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
21+
<version>2.0.0</version>
2222
</dependency>
2323

2424
<dependency>
25-
<groupId>javax.servlet</groupId>
26-
<artifactId>javax.servlet-api</artifactId>
27-
<version>3.1.0</version>
25+
<groupId>jakarta.servlet</groupId>
26+
<artifactId>jakarta.servlet-api</artifactId>
27+
<version>5.0.0</version>
2828
<scope>provided</scope>
2929
</dependency>
3030
<dependency>
31-
<groupId>javax.servlet.jsp</groupId>
32-
<artifactId>javax.servlet.jsp-api</artifactId>
33-
<version>2.3.0</version>
31+
<groupId>jakarta.servlet.jsp</groupId>
32+
<artifactId>jakarta.servlet.jsp-api</artifactId>
33+
<version>3.0.0</version>
3434
<scope>provided</scope>
3535
</dependency>
3636
</dependencies>

‎core/maven-example/src/main/java/example/Book.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.kohsuke.stapler.StaplerRequest;
44
import org.kohsuke.stapler.StaplerResponse;
55

6-
import javax.servlet.ServletException;
6+
import jakarta.servlet.ServletException;
77
import java.io.IOException;
88

99
/**

‎core/maven-example/src/main/java/example/BookStore.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.kohsuke.stapler.StaplerRequest;
44
import org.kohsuke.stapler.StaplerResponse;
55

6-
import javax.servlet.ServletException;
6+
import jakarta.servlet.ServletException;
77
import java.io.IOException;
88
import java.util.Hashtable;
99
import java.util.Map;

‎core/maven-example/src/main/java/example/WebAppMain.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import org.kohsuke.stapler.Stapler;
44

5-
import javax.servlet.ServletContextListener;
6-
import javax.servlet.ServletContextEvent;
5+
import jakarta.servlet.ServletContextListener;
6+
import jakarta.servlet.ServletContextEvent;
77

88
/**
99
* This class is invoked by the container at the beginning

‎core/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
</dependency>
4141
<dependency>
4242
<!-- perhaps mark this dependency optional? -->
43-
<groupId>commons-fileupload</groupId>
44-
<artifactId>commons-fileupload</artifactId>
45-
<version>1.4</version>
43+
<groupId>org.apache.commons</groupId>
44+
<artifactId>commons-fileupload2</artifactId>
45+
<version>2.0-SNAPSHOT</version>
4646
</dependency>
4747
<dependency>
4848
<groupId>commons-io</groupId>
@@ -64,9 +64,9 @@
6464
<version>2.1.0</version>
6565
</dependency>
6666
<dependency>
67-
<groupId>javax.servlet</groupId>
68-
<artifactId>javax.servlet-api</artifactId>
69-
<version>3.1.0</version>
67+
<groupId>jakarta.servlet</groupId>
68+
<artifactId>jakarta.servlet-api</artifactId>
69+
<version>5.0.0</version>
7070
<scope>provided</scope>
7171
</dependency>
7272
<dependency>

‎core/src/main/java/org/kohsuke/stapler/AcceptHeader.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ of this software and associated documentation files (the "Software"), to deal
2626
import org.apache.commons.lang.math.NumberUtils;
2727

2828
import edu.umd.cs.findbugs.annotations.Nullable;
29-
import javax.servlet.http.HttpServletResponse;
29+
import jakarta.servlet.http.HttpServletResponse;
3030
import java.util.ArrayList;
3131
import java.util.Arrays;
3232
import java.util.HashMap;

‎core/src/main/java/org/kohsuke/stapler/Ancestor.java‎

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

2424
package org.kohsuke.stapler;
2525

26-
import javax.servlet.http.HttpServletRequest;
26+
import jakarta.servlet.http.HttpServletRequest;
2727

2828
/**
2929
* Information about ancestor of the "it" node.

0 commit comments

Comments
 (0)