Skip to content

XWIKI-15026: Upgrade Font Awesome to 7.x #4770

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

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

XWIKI-15026: Upgrade Font Awesome to 7.x #4770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0ffb3f
XWIKI-15026: Upgrade Font Awesome to 7.x
thiagokr Nov 10, 2025
6fe1c48
XWIKI-15026: Upgrade Font Awesome to 7.x
thiagokr Nov 11, 2025
abbb945
Merge branch 'xwiki:master' into XWIKI-15026
tkrieck Nov 12, 2025
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: 1 addition & 1 deletion xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>font-awesome</artifactId>
<version>4.7.0</version>
<version>7.0.1</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...atform-icon/xwiki-platform-icon-fontawesome/src/main/resources/IconThemes/FontAwesome.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<hidden>true</hidden>
<content>## General settings
xwiki.iconset.type = font
xwiki.iconset.css = $services.webjars.url('org.webjars:font-awesome', 'css/font-awesome.min.css')
xwiki.iconset.css = $services.webjars.url('org.webjars:font-awesome','css/all.css'),$services.webjars.url('org.webjars:font-awesome','css/v4-shims.css')
xwiki.iconset.render.wiki = {{html clean="false"}}&lt;span class="fa fa-$icon" aria-hidden="true"&gt;&lt;/span&gt;{{/html}}
xwiki.iconset.render.html = &lt;span class="fa fa-$icon" aria-hidden="true"&gt;&lt;/span&gt;
xwiki.iconset.icon.cssClass = fa fa-$icon
Expand Down
2 changes: 1 addition & 1 deletion ...index-tree/xwiki-platform-index-tree-war/src/main/webapp/templates/documentTree_macros.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
## used; the icon theme API is currently only able to render an icon but there's no way to get the icon configuration
## as jsTree expects it. The alternative is to use the HTML source to feed the tree but then the tree definition and
## configuration becomes complex.
#set ($discard = $xwiki.linkx.use($services.webjars.url('org.webjars:font-awesome', 'css/font-awesome.min.css'), {
#set ($discard = $xwiki.linkx.use($services.webjars.url('org.webjars:font-awesome', 'css/fontawesome.min.css'), {
'type': 'text/css', 'rel': 'stylesheet'}))
#set ($_options = $macro.options)
#tree($_options)
Expand Down
2 changes: 1 addition & 1 deletion xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>font-awesome</artifactId>
<version>4.7.0</version>
<version>7.0.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
31 changes: 14 additions & 17 deletions ...i/src/test/java/org/xwiki/webjars/internal/FilesystemResourceReferenceSerializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,14 @@ public void serialize() throws Exception
Mockito.when(exportContextProvider.get()).thenReturn(exportContext);

WebJarsResourceReference reference = new WebJarsResourceReference("wiki:wiki", Arrays.asList(
"font-awesome", "4.7.0", "fonts/FontAwesome.otf"));
"font-awesome", "7.0.1", "fonts/fa-regular-400.woff2"));

// Verify that the returned URL is ok
assertEquals("webjars/font-awesome/4.7.0/fonts/FontAwesome.otf",
assertEquals("webjars/font-awesome/7.0.1/fonts/fa-regular-400.woff2",
this.mocker.getComponentUnderTest().serialize(reference).serialize());

// Also verify that the resource has been copied!
assertTrue(new File(BASEDIR, "webjars/font-awesome/4.7.0/fonts/FontAwesome.otf").exists());
assertTrue(new File(BASEDIR, "webjars/font-awesome/7.0.1/fonts/fa-regular-400.woff2").exists());
}

@Test
Expand All @@ -93,14 +93,14 @@ public void serializeWithCSSPathAdjustments() throws Exception
Mockito.when(exportContextProvider.get()).thenReturn(exportContext);

WebJarsResourceReference reference = new WebJarsResourceReference("wiki:wiki", Arrays.asList(
"font-awesome", "4.7.0", "fonts/FontAwesome.otf"));
"font-awesome", "7.0.1", "fonts/fa-regular-400.woff2"));

// Verify that the returned URL is ok
assertEquals("../../../webjars/font-awesome/4.7.0/fonts/FontAwesome.otf",
assertEquals("../../../webjars/font-awesome/7.0.1/fonts/fa-regular-400.woff2",
this.mocker.getComponentUnderTest().serialize(reference).serialize());

// Also verify that the resource has been copied!
assertTrue(new File(BASEDIR, "webjars/font-awesome/4.7.0/fonts/FontAwesome.otf").exists());
assertTrue(new File(BASEDIR, "webjars/font-awesome/7.0.1/fonts/fa-regular-400.woff2").exists());
}

@Test
Expand All @@ -115,14 +115,14 @@ public void serializeWithCSSPathAdjustmentsWithDocParentLevels() throws Exceptio
Mockito.when(exportContextProvider.get()).thenReturn(exportContext);

WebJarsResourceReference reference = new WebJarsResourceReference("wiki:wiki", Arrays.asList(
"font-awesome", "4.7.0", "fonts/FontAwesome.otf"));
"font-awesome", "7.0.1", "fonts/fa-regular-400.woff2"));

// Verify that the returned URL is ok
assertEquals("../../webjars/font-awesome/4.7.0/fonts/FontAwesome.otf",
assertEquals("../../webjars/font-awesome/7.0.1/fonts/fa-regular-400.woff2",
this.mocker.getComponentUnderTest().serialize(reference).serialize());

// Also verify that the resource has been copied!
assertTrue(new File(BASEDIR, "webjars/font-awesome/4.7.0/fonts/FontAwesome.otf").exists());
assertTrue(new File(BASEDIR, "webjars/font-awesome/7.0.1/fonts/fa-regular-400.woff2").exists());
}

@Test
Expand All @@ -136,18 +136,15 @@ public void serializeCSSResourceWithURLsInIt() throws Exception
Mockito.when(exportContextProvider.get()).thenReturn(exportContext);

WebJarsResourceReference reference = new WebJarsResourceReference("wiki:wiki", Arrays.asList(
"font-awesome", "4.7.0", "css/font-awesome.min.css"));
"font-awesome", "7.0.1", "css/font-awesome.min.css"));

assertEquals("webjars/font-awesome/4.7.0/css/font-awesome.min.css",
assertEquals("webjars/font-awesome/7.0.1/css/font-awesome.min.css",
this.mocker.getComponentUnderTest().serialize(reference).serialize());

// Also verify that the resources haves been copied!
assertTrue(new File(BASEDIR, "webjars/font-awesome/4.7.0/css/font-awesome.min.css").exists());
assertTrue(new File(BASEDIR, "webjars/font-awesome/4.7.0/fonts/fontawesome-webfont.eot").exists());
assertTrue(new File(BASEDIR, "webjars/font-awesome/4.7.0/fonts/fontawesome-webfont.woff2").exists());
assertTrue(new File(BASEDIR, "webjars/font-awesome/4.7.0/fonts/fontawesome-webfont.woff").exists());
assertTrue(new File(BASEDIR, "webjars/font-awesome/4.7.0/fonts/fontawesome-webfont.svg").exists());
assertTrue(new File(BASEDIR, "webjars/font-awesome/4.7.0/fonts/fontawesome-webfont.ttf").exists());
assertTrue(new File(BASEDIR, "webjars/font-awesome/7.0.1/css/fontawesome.min.css").exists());
assertTrue(new File(BASEDIR, "webjars/font-awesome/7.0.1/fonts/v4-shims.css").exists());
assertTrue(new File(BASEDIR, "webjars/font-awesome/7.0.1/fonts/fa-regular-400.woff2").exists());

}
}