Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jakarta #1388

Merged
merged 3 commits into from
Oct 10, 2023
Merged

Jakarta #1388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2532b7
Apparently old versions of java 1.8 don't have strip()
AngledLuffa Oct 10, 2023
2e1f609
Update to jakarta servlet
AngledLuffa Oct 8, 2023
5ab7593
Get rid of some .* imports from NERServlet
AngledLuffa Oct 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .classpath
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
Binary file not shown.
Binary file removed lib/javax.servlet.jar
View file
Open in desktop
Binary file not shown.
Binary file added libsrc/jakarta.servlet-api-4.0.4-sources.jar
View file
Open in desktop
Binary file not shown.
7 changes: 4 additions & 3 deletions pom-java-11.xml
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
6 changes: 4 additions & 2 deletions src/edu/stanford/nlp/ie/ner/webapp/NERServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
import java.util.*;
import java.util.zip.*;

import javax.servlet.*;
import javax.servlet.http.*;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import edu.stanford.nlp.io.IOUtils;
import org.apache.commons.lang3.StringEscapeUtils;
Expand Down
2 changes: 1 addition & 1 deletion src/edu/stanford/nlp/trees/ud/UniversalDependenciesConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ public static void main(String[] args) {
String text = "";
while (text.equals("")) {
try {
text = textIterator.next().strip();
text = textIterator.next().trim();
} catch (NoSuchElementException e) {
throw new RuntimeException("Processed " + graphIdx + " trees, but there are more trees and text is empty", e);
}
Expand Down