Skip to content

Commit

Permalink
Update to jakarta servlet
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@AngledLuffa
AngledLuffa committed Oct 10, 2023
1 parent aa37ebf commit 8a671fd
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<classpathentry exported="true" kind="lib" path="lib/tomcat/tomcat-api.jar" sourcepath="libsrc/tomcat/apache-tomcat-7.0.12-src.zip"/>
<classpathentry exported="true" kind="lib" path="lib/commons-logging.jar" sourcepath="libsrc/commons-logging-1.2-src.zip"/>
<classpathentry exported="true" kind="lib" path="lib/junit-4.13.1.jar" sourcepath="libsrc/junit-4.13.1-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/javax.servlet.jar" sourcepath="libsrc/tomcat/apache-tomcat-7.0.12-src.zip"/>
<classpathentry exported="true" kind="lib" path="lib/jakarta.servlet-api-4.0.4.jar" sourcepath="libsrc/jakarta.servlet-api-4.0.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/AppleJavaExtensions.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jflex-full-1.8.2.jar" sourcepath="libsrc/jflex-1.8.2.zip"/>
<classpathentry exported="true" kind="lib" path="lib/xom-1.3.9.jar" sourcepath="libsrc/xom-1.3.9-sources.jar"/>
Expand Down
7 changes: 4 additions & 3 deletions doc/corenlp/pom-full.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,11 @@
<version>7.5.0</version>
</dependency>

<!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>4.0.4</version>
</dependency>

<dependency>
Expand Down
18 changes: 9 additions & 9 deletions lib/README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,19 +338,19 @@ LAST UPDATE: 2020-11-04
LAST UPDATE BY: John Bauer

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

USED BY: Our servlets
Not needed by CoreNLP distributions

LAST UPDATE: 2013
LAST UPDATE BY: Spence Green
LAST UPDATE: 2023
LAST UPDATE BY: John Bauer

-----------------------------------------------------------------
protobuf.jar
Expand Down
Binary file added lib/jakarta.servlet-api-4.0.4.jar
View file
Binary file not shown.
Binary file removed lib/javax.servlet.jar
View file
Binary file not shown.
Binary file added libsrc/jakarta.servlet-api-4.0.4-sources.jar
View file
Binary file not shown.
7 changes: 4 additions & 3 deletions pom-java-11.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,11 @@
<version>7.5.0</version>
</dependency>

<!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>4.0.4</version>
</dependency>

<dependency>
Expand Down
7 changes: 4 additions & 3 deletions pom-java-17.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,11 @@
<version>7.5.0</version>
</dependency>

<!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>4.0.4</version>
</dependency>

<dependency>
Expand Down
7 changes: 4 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,11 @@
<version>7.5.0</version>
</dependency>

<!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>4.0.4</version>
</dependency>

<dependency>
Expand Down

0 comments on commit 8a671fd

Please sign in to comment.