This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch v3 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 6e200b6191942abebe6d5733a17ebd717fa03ee3 Author: andi-huber <[email protected]> AuthorDate: Thu Jan 8 14:49:20 2026 +0100 CAUSEWAY-3948: removes hard coded version strings from font-awesome (webjar) --- .../causeway/viewer/commons/model/decorators/IconDecorator.java | 2 +- .../ui/pages/common/fontawesome/FontAwesomeCssReferenceWkt.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/decorators/IconDecorator.java b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/decorators/IconDecorator.java index 3547cb15735..188a2051f08 100644 --- a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/decorators/IconDecorator.java +++ b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/decorators/IconDecorator.java @@ -33,7 +33,7 @@ public interface IconDecorator<T, R> { * corresponds to the webjars path as provided by the maven artifact * {@code org.webjars:font-awesome} */ - public static final String FONTAWESOME_RESOURCE = "font-awesome/7.1.0/css/all.min.css"; + public static final String FONTAWESOME_RESOURCE_FORMAT = "font-awesome/%s/css/all.min.css"; R decorate(T uiComponent, Optional<FontAwesomeLayers> faLayers); diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/fontawesome/FontAwesomeCssReferenceWkt.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/fontawesome/FontAwesomeCssReferenceWkt.java index 39f91dc3403..fd1ebde567e 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/fontawesome/FontAwesomeCssReferenceWkt.java +++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/fontawesome/FontAwesomeCssReferenceWkt.java @@ -21,6 +21,7 @@ import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.causeway.viewer.commons.model.decorators.IconDecorator; +import org.apache.causeway.viewer.commons.model.webjar.WebjarEnumerator; import lombok.Getter; import lombok.experimental.Accessors; @@ -42,7 +43,9 @@ public static CssHeaderItem asHeaderItem() { * Private constructor. */ private FontAwesomeCssReferenceWkt() { - super(IconDecorator.FONTAWESOME_RESOURCE); + super(IconDecorator.FONTAWESOME_RESOURCE_FORMAT + .formatted(WebjarEnumerator.lookupElseFail("font-awesome") + .version())); } }
