Skip to content

Upgrade to Jena Fuseki 5.3.0, including a new Dockerfile#1778

Merged
osma merged 3 commits intomainfrom
issue1775-upgrade-fuseki
Mar 19, 2025
Merged

Upgrade to Jena Fuseki 5.3.0, including a new Dockerfile#1778
osma merged 3 commits intomainfrom
issue1775-upgrade-fuseki

Conversation

@osma
Copy link
Member

@osma osma commented Mar 13, 2025 •
edited
Loading

Reasons for creating this PR

Our Fuseki version is obsolete, see #1775. This PR upgrades Fuseki to 5.3.0 and also inclusdes some changes to the Fuseki Dockerfile (upgrade from Java 17 to 21 and a newer Alpine Linux base image).

This PR also includes a fix to the natural sorting behavior of the hierarchy tab. The Fuseki upgrade surfaced a problem where the sort order was sometimes inconsistent when using natural sorting by notation code. This PR changes the code to include a fallback sorting order which ensures a consistent sorting result and adjusts the Cypress tests to better reflect important differences between different sorting orders.

Link to relevant issue(s), if any

Description of the changes in this PR

  • bump JENA_VERSION to 5.3.0 (was 4.7.0)
  • upgrade the Dockerfile for Fuseki, copied from Apache Jena
  • fall back to non-numeric sort to ensure a consistent natural sorting order in the hierarchy tab
  • adjust the hierarchy Cypress tests to better reflect differences between sorting orders

Known problems or uncertainties in this PR

Checklist

  • phpUnit tests pass locally with my changes
  • I have added tests that show that the new code works, or tests are not relevant for this PR (e.g. only HTML/CSS changes)
  • The PR doesn't reduce accessibility of the front-end code (e.g. tab focus, scaling to different resolutions, use of .sr-only class, color contrast)
  • The PR doesn't introduce unintended code changes (e.g. empty lines or useless reindentation)

@osma osma added the maintenance Dependency changes, security updates, infrastructure tweaks & general mainenance label Mar 13, 2025
@osma osma added this to the 3.0 milestone Mar 13, 2025
@osma osma self-assigned this Mar 13, 2025
@osma osma moved this to In progress in Skosmos 3.x Backlog Mar 13, 2025
@osma
Copy link
Member Author

osma commented Mar 13, 2025 •
edited
Loading

Test execution times after upgrading to 5.3.0:

PHPUnit:

Time: 00:33.305, Memory: 14.00 MB

There was 1 PHPUnit test runner warning:

1) No code coverage driver available

WARNINGS!
Tests: 518, Assertions: 997, Warnings: 1, Skipped: 3.

Cypress:

✔  All specs passed!                        01:02      150      147        -        3        -

The runtimes are roughly the same as before (see #1775 (comment)), actually a bit faster but that's probably just measurement error.

@codecov
Copy link

codecov bot commented Mar 18, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 70.90%. Comparing base (619419a) to head (d048386).
Report is 18 commits behind head on main.

Additional details and impacted files 
@@             Coverage Diff              @@
##               main    #1778      +/-   ##
============================================
- Coverage     70.94%   70.90%   -0.05%     
  Complexity     1650     1650              
============================================
  Files            33       33              
  Lines          4330     4330              
============================================
- Hits           3072     3070       -2     
- Misses         1258     1260       +2

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@osma
Copy link
Member Author

osma commented Mar 18, 2025 •
edited
Loading

Test execution times on GitHub Actions are also roughly the same as before; slightly faster actually, but this could be due to measurement error.

Current main:

image

This PR:

image

@osma osma moved this from In progress to Needs review in Skosmos 3.x Backlog Mar 18, 2025
@sonarqubecloud
Copy link

sonarqubecloud bot commented Mar 19, 2025

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@osma osma requested a review from joelit March 19, 2025 09:06
joelit
joelit approved these changes Mar 19, 2025
View reviewed changes
Copy link
Contributor

@joelit joelit left a comment

Choose a reason for hiding this comment

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

LGTM!

@osma osma merged commit dbc6a01 into main Mar 19, 2025
11 checks passed
@osma osma deleted the issue1775-upgrade-fuseki branch March 19, 2025 13:12
@github-project-automation github-project-automation bot moved this from Needs review to Issue/PR closed in Skosmos 3.x Backlog Mar 19, 2025
@osma osma mentioned this pull request May 13, 2025
Merged
4 tasks
@osma osma mentioned this pull request Oct 28, 2025
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@joelit joelit joelit approved these changes

Assignees

@osma osma

Labels

maintenance Dependency changes, security updates, infrastructure tweaks & general mainenance

Projects

None yet

Milestone

3.0-alpha.1

Development

Successfully merging this pull request may close these issues.

Upgrade Fuseki used in Skosmos tests and containers

2 participants

@osma @joelit