Repository navigation
Take the OFL fonts of wicket-examples out of the source tree (11.x) - #1935
Merged
Merged
Conversation
League Gothic is under the SIL Open Font License, which the ASF puts in Category B: it may ship in a built artifact, but not in a source release. release.sh builds the source release with git archive, so the font went into it twice: as the files in wicket-examples/.../examples/fonts/league-gothic/, and base64-embedded as an @font-face data URI in four logo SVGs. Only logo-apachewicket-examples-white.svg is used, by WicketExampleHeader and HomePageHeader. Its two text elements, WICKET and EXAMPLES, are now paths: the glyph outlines of the embedded League Gothic 1.560, shaped with its kerning at the same size and position. Outlines are artwork, not font software, so no OFL work remains in the file. Rendered at three times the size in Chromium, 180 of 374,400 pixels differ, all on glyph edges where hinted text and a filled path anti-alias differently. Each path keeps its word as aria-label. apachewicket7.svg, logo-apachewicket-tungsten.svg and logo-apachewicket-white.svg are referenced by nothing and are removed, as is the league-gothic directory, whose stylesheet no page loaded. LICENSE no longer lists League Gothic. GitHub issue #1846 Generated-by: Claude Code (Claude Opus 5.5) (cherry picked from commit ff7ef25)
Source Sans Pro and Source Code Pro are under the SIL Open Font License, which the ASF puts in Category B: they may ship in the examples war, but not in a source release. release.sh builds the source release with git archive, so the 54 files in wicket-examples/.../examples/fonts/ went into it. The examples pom now unpacks the fonts from the fontsource webjars into target/classes/org/apache/wicket/examples/fonts/ in generate-resources, the way the guide profile does since #1896: only the woff2 files the stylesheets use, each family with its licence as LICENSE-<family>.txt. fonts.css, under the Apache License, declares them with @font-face and replaces the two stylesheets of the old font kits, whose eot, svg, ttf and woff formats served browsers Wicket no longer supports. The fonts directory, its line in .rat-excludes and the SIL Open Font License section of LICENSE go; that section listed nothing else. The examples war is not part of the binary distribution, which copies only jars, so LICENSE-binary is unchanged; the war carries the licences next to the fonts. The OFL asks for no NOTICE entry. The text font stays Source Sans Pro, but in version 2.045 from fontsource:5.2.5 instead of the 1.033 Font Squirrel kit. The design is the same; the newer cut sits about two pixels lower in its line box and sets slightly tighter, so the odd line wraps differently. Weights 200, 300, 400 and 700 are kept, with italics for 300 to 700. The code font changes from Source Code Pro to JetBrains Mono (fontsource:5.3.0, weights 300, 400 and 700), because no webjar of Source Code Pro exists on Maven Central. JetBrains Mono is the code font of the reference guide and the site, and its webjar is the one the guide already uses. Code in the examples looks visibly different: wider letterforms, taller x-height. The font stacks fall back to system faces for a build or an IDE run without the fonts: Segoe UI, Myriad Pro, Ubuntu, Noto Sans, Helvetica Neue and Arial for the text, and the guide's monospace stack for code. GitHub issue #1846 Generated-by: Claude Code (Claude Opus 5.5) (cherry picked from commit c2009a3a14b7f30dae4fa15f78275557097f0a23) Backport to wicket-11.x. The only conflict was in .rat-excludes, which still has the line for wicket-user-guide/src/main/asciidoc/css/style.css here; it is kept. #1896, which the message refers to, is only on master: the guide on this line uses no web fonts. Generated-by: Claude Code (Claude Opus 5.5)
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## wicket-11.x #1935 +/- ##
=================================================
- Coverage 62.71% 62.70% -0.01%
+ Complexity 11510 11508 -2
=================================================
Files 1254 1254
Lines 48665 48665
Branches 6845 6845
=================================================
- Hits 30520 30516 -4
- Misses 15471 15472 +1
- Partials 2674 2677 +3 🚀 New features to boost your workflow:
|
…-1846-11.x # Conflicts: # .rat-excludes
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #1934 to wicket-11.x: takes the SIL OFL fonts of wicket-examples (Source Sans Pro, Source Code Pro, League Gothic) out of the source tree, so a source release made with
git archivecontains no font software. Part of #1846.Both commits are cherry-picked with
-x:.rat-excludes, over a line for the guide'scss/style.css.wicket-11.x has since received the backports of #1845 and #1896, so
origin/wicket-11.xis merged into this branch. The only conflict was.rat-excludesagain, and it now matches master. The backport note in the second commit says #1896 is only on master; that was true when the commit was made and no longer is. As on master,LICENSEhas no SIL OFL section after this change.The visible changes are the same as on master. Code moves from Source Code Pro to JetBrains Mono, because no Source Code Pro webjar exists on Maven Central. Source Sans Pro moves from the 1.033 kit to version 2.045 from fontsource. The logo is pixel-equivalent. See #1934 for details.
Tested
mvn clean verify -Pjs-testandmvn -N apache-rat:checkare green on this branch.git ls-treeshows no font files.🤖 Generated with Claude Code