Skip to content

Commit 8a671fd

Browse files
committed
Update to jakarta servlet
Remove the old javax.servlet jar (4.0.4 apparently has fewer security issues) Update all servlet uses in .xml files to use jakarta 4.0.4. #1269
1 parent aa37ebf commit 8a671fd

9 files changed

+26
-22
lines changed

.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<classpathentry exported="true" kind="lib" path="lib/tomcat/tomcat-api.jar" sourcepath="libsrc/tomcat/apache-tomcat-7.0.12-src.zip"/>
1414
<classpathentry exported="true" kind="lib" path="lib/commons-logging.jar" sourcepath="libsrc/commons-logging-1.2-src.zip"/>
1515
<classpathentry exported="true" kind="lib" path="lib/junit-4.13.1.jar" sourcepath="libsrc/junit-4.13.1-sources.jar"/>
16-
<classpathentry exported="true" kind="lib" path="lib/javax.servlet.jar" sourcepath="libsrc/tomcat/apache-tomcat-7.0.12-src.zip"/>
16+
<classpathentry exported="true" kind="lib" path="lib/jakarta.servlet-api-4.0.4.jar" sourcepath="libsrc/jakarta.servlet-api-4.0.4-sources.jar"/>
1717
<classpathentry exported="true" kind="lib" path="lib/AppleJavaExtensions.jar"/>
1818
<classpathentry exported="true" kind="lib" path="lib/jflex-full-1.8.2.jar" sourcepath="libsrc/jflex-1.8.2.zip"/>
1919
<classpathentry exported="true" kind="lib" path="lib/xom-1.3.9.jar" sourcepath="libsrc/xom-1.3.9-sources.jar"/>

doc/corenlp/pom-full.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,11 @@
7777
<version>7.5.0</version>
7878
</dependency>
7979

80+
<!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
8081
<dependency>
81-
<groupId>javax.servlet</groupId>
82-
<artifactId>javax.servlet-api</artifactId>
83-
<version>3.0.1</version>
82+
<groupId>jakarta.servlet</groupId>
83+
<artifactId>jakarta.servlet-api</artifactId>
84+
<version>4.0.4</version>
8485
</dependency>
8586

8687
<dependency>

lib/README

+9-9
Original file line numberDiff line numberDiff line change
@@ -338,19 +338,19 @@ LAST UPDATE: 2020-11-04
338338
LAST UPDATE BY: John Bauer
339339

340340
-----------------------------------------------------------------
341-
javax.servlet.jar
342-
ORIGINAL JAR NAME: servlet-api.jar
343-
VERSION: 3.0
344-
RELEASE DATE: ?
345-
SOURCE AVAILABLE: Yes. In: libsrc/tomcat/apache-tomcat-7.0.12-src.zip
346-
DESCRIPTION: Used by Tomcat and servlets. Originally part of Java EE 6.
347-
URL: ?
341+
jakarta.servlet-api-4.0.4.jar
342+
ORIGINAL JAR NAME: jakarta.servlet-api-4.0.4.jar
343+
VERSION: 4.0.4
344+
RELEASE DATE: 2020
345+
SOURCE AVAILABLE: Yes. In: libsrc/jakarta.servlet-api-4.0.4-sources.jar
346+
DESCRIPTION: Used by servlets. Replaces javax.servlet.jar
347+
URL: https://central.sonatype.com/artifact/jakarta.servlet/jakarta.servlet-api/4.0.4/versions
348348

349349
USED BY: Our servlets
350350
Not needed by CoreNLP distributions
351351

352-
LAST UPDATE: 2013
353-
LAST UPDATE BY: Spence Green
352+
LAST UPDATE: 2023
353+
LAST UPDATE BY: John Bauer
354354

355355
-----------------------------------------------------------------
356356
protobuf.jar

lib/jakarta.servlet-api-4.0.4.jar

81 KB
Binary file not shown.

lib/javax.servlet.jar

-238 KB
Binary file not shown.
163 KB
Binary file not shown.

pom-java-11.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,11 @@
7575
<version>7.5.0</version>
7676
</dependency>
7777

78+
<!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
7879
<dependency>
79-
<groupId>javax.servlet</groupId>
80-
<artifactId>javax.servlet-api</artifactId>
81-
<version>3.0.1</version>
80+
<groupId>jakarta.servlet</groupId>
81+
<artifactId>jakarta.servlet-api</artifactId>
82+
<version>4.0.4</version>
8283
</dependency>
8384

8485
<dependency>

pom-java-17.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,11 @@
7575
<version>7.5.0</version>
7676
</dependency>
7777

78+
<!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
7879
<dependency>
79-
<groupId>javax.servlet</groupId>
80-
<artifactId>javax.servlet-api</artifactId>
81-
<version>3.0.1</version>
80+
<groupId>jakarta.servlet</groupId>
81+
<artifactId>jakarta.servlet-api</artifactId>
82+
<version>4.0.4</version>
8283
</dependency>
8384

8485
<dependency>

pom.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,11 @@
7777
<version>7.5.0</version>
7878
</dependency>
7979

80+
<!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
8081
<dependency>
81-
<groupId>javax.servlet</groupId>
82-
<artifactId>javax.servlet-api</artifactId>
83-
<version>3.0.1</version>
82+
<groupId>jakarta.servlet</groupId>
83+
<artifactId>jakarta.servlet-api</artifactId>
84+
<version>4.0.4</version>
8485
</dependency>
8586

8687
<dependency>

0 commit comments

Comments
 (0)