Skip to content

Implement Jakarta Servlet 5 for Jetty 11 #106

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

Open
tfmorris wants to merge 8 commits into
base: openrefine
Choose a base branch
from
Open

Implement Jakarta Servlet 5 for Jetty 11 #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
25d55b1
Ignore IntelliJ settings & normalize line endings
tfmorris Sep 28, 2023
1cd40db
Update to Velocity 2
tfmorris Sep 27, 2023
82f7e74
Don't ignore requested encoding for getResourceReader
tfmorris Feb 11, 2024
84caf02
Update vulnerable dependencies - breaking API change!
tfmorris Sep 28, 2023
9140809
Clean up and modernize
tfmorris Sep 28, 2023
3a19ba1
Clean up more Jetty 6 leftovers
tfmorris Apr 4, 2021
c5de111
Update to Jakarta servlet-api 5.
tfmorris Sep 27, 2023
04a82db
Revert to Servlet 4.0 / EE8
tfmorris Jan 6, 2024
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: 2 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Set default behavior to automatically normalize line endings.
* text=auto
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
server/classes
main/target
/.idea/
/.settings/
/main/.settings/
27 changes: 16 additions & 11 deletions main/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<parent>
<groupId>org.openrefine.dependencies</groupId>
<artifactId>butterfly-container</artifactId>
<version>1.2.6-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>

<groupId>org.openrefine.dependencies</groupId>
<artifactId>butterfly</artifactId>
<version>1.2.6-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>

<name>SIMILE Butterfly Engine</name>
<url>https://github.com/OpenRefine/simile-butterfly/</url>
Expand Down Expand Up @@ -63,24 +63,29 @@

<dependencies>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.2</version>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>4.4</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
<version>2.9.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.15.1</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.9</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.6.3</version>
<artifactId>velocity-engine-core</artifactId>
<version>2.3</version>
</dependency>
<dependency>
<groupId>org.mozilla</groupId>
Expand Down
Loading