Skip to content

Comments

Firefly 1836 tomcat upgrade#1851

Merged
loitly merged 3 commits intodevfrom
FIREFLY-1836-tomcat-upgrade
Sep 30, 2025
Merged

Firefly 1836 tomcat upgrade#1851
loitly merged 3 commits intodevfrom
FIREFLY-1836-tomcat-upgrade

Conversation

@loitly
Copy link
Contributor

@loitly loitly commented Sep 26, 2025

Ticket: https://jira.ipac.caltech.edu/browse/FIREFLY-1836

Additional changes:
https://github.com/IPAC-SW/irsa-ife/pull/440
lsst/suit#75

Changes:

  • Moved text data compression to Tomcat instead of using a filter
  • Upgraded Servlet API from v4.0 to v6.1
  • Upgraded WebSocket API from v1.1 to v2.2
  • Upgraded org.apache.commons:fileupload from v1.2.2 to v2.0
    • Migrated AnyFileUpload code to the new v2.0 library
  • Removed usage of MultiPartHandler, which was based on the old commons-fileupload
  • Minor Gradle refactoring due to build errors
    • Switched to non-daemon threads to avoid build cache issues
    • purge task now also cleans the Maven cache and repositories

Test:
Please verify core functionality after the Tomcat upgrade, focusing on file upload and WebSocket (including FireflyClient) features.

https://firefly-1836-tomcat-upgrade.irsakudev.ipac.caltech.edu/irsaviewer/
https://firefly-1836-tomcat-upgrade.irsakudev.ipac.caltech.edu/applications/spherex/
https://firefly-1836-tomcat-upgrade.irsakudev.ipac.caltech.edu/applications/wise/
https://fireflydev.ipac.caltech.edu/firefly-1836-tomcat-upgrade/firefly/
https://firefly-1836-tomcat-upgrade.irsakudev.ipac.caltech.edu/suit/

@loitly loitly added this to the 2025.5 milestone Sep 26, 2025
@loitly loitly self-assigned this Sep 26, 2025
Copy link
Contributor

@robyww robyww left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes look good.

The upgrade did not affect as much as I thought it would except for the import changes.

I don't see any notes about upgrading outside of docker for the developer development environment. I am assuming then it just getting apache-tomcat-11.0.11 3 and replacing the tomcat.

COPY --from=builder /opt/work/${build_dir}/build/dist/*.war ${CATALINA_HOME}/webapps-ref/

# Enable GZIP compression in Tomcat's HTTP connector
RUN sed -i 's/<Connector port="8080" protocol="HTTP\/1.1"/<Connector port="8080" protocol="HTTP\/1.1" compression="on" useSendfile="false" compressibleMimeType="text\/html,text\/plain,text\/css,text\/javascript,application\/javascript,application\/json,application\/xml,text\/xml,application\/x-votable+xml,application\/x-yaml,application\/ld+json,image\/svg+xml,text\/csv,application\/xhtml+xml,application\/rss+xml,application\/atom+xml,application\/x-font-ttf,font\/otf,font\/woff,font\/woff2"/' \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you make this a script? it is very hard to understand.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also is there any related setup to the local developer environment?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes to developer's setup are here: https://github.com/IPAC-SW/irsa-ife/pull/440/files#diff-865bcc67bc7ab28b0cfc427453a74b51aae44b381a574d6769cf78e1f2cf4c44

I don’t think a script would help, but I can add more comments to explain what it’s doing.

Copy link
Contributor

@kpuriIpac kpuriIpac left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did some basic testing of all the apps linked here (including Euclid, which I think you also built but just missed the link here). Looks good!

@loitly loitly merged commit 1d9451d into dev Sep 30, 2025
@loitly loitly deleted the FIREFLY-1836-tomcat-upgrade branch September 30, 2025 21:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants