chore: deliver fonts from Apache website rather than 3rd party CDN

vlsi · vlsi · commit df944af1e6db · 2025-11-03T21:58:20.000+03:00
Fixes #6552
diff --git a/.gitignore b/.gitignore
@@ -86,3 +86,6 @@ jmeter-fb.*
 hs_err_pid*
 # other jvm related files
 .attach_*
+
+# npm/node dependencies and generated web assets
+/xdocs/node_modules/
diff --git a/.ratignore b/.ratignore
@@ -36,6 +36,10 @@ test/resources/**
 #**/*.log
 **/download_jmeter.cgi
 xdocs/extending/HTML_REPORT_README.TXT
+xdocs/node_modules/**
+xdocs/package.json
+xdocs/package-lock.json
+xdocs/yarn.lock
 # Rat should automatically detect below files as binary, however it fails
 **/*.sxi
 **/*.sxw
diff --git a/build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts
@@ -50,6 +50,8 @@ autostyle {
             include("**/*.xsd", "**/*.xsl", "**/*.xml")
             // Autostyle does not support gitignore yet https://github.com/autostyle/autostyle/issues/13
             exclude("out/**")
+            exclude(".gradle/**")
+            exclude("node_modules")
             if (project == rootProject) {
                 if (isActualPluginApplication) {
                     exclude(rootDir.resolve(".ratignore").readLines())
@@ -65,7 +67,11 @@ autostyle {
         license()
     }
     format("markdown") {
-        filter.include("**/*.md")
+        filter {
+            include("**/*.md")
+            exclude(".gradle/**")
+            exclude("node_modules")
+        }
         endWithNewline()
     }
 }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -373,6 +373,19 @@
             <pgp value="8756C4F765C9AC3CB6B85D62379CE192D401AB61"/>
          </artifact>
       </component>
+      <component group="com.github.node-gradle" name="gradle-node-plugin" version="7.1.0">
+         <artifact name="gradle-node-plugin-7.1.0.jar">
+            <sha256 value="9aa26c3b075f42eb801fc94cb32fc59c6968a78119efda9ce02356834a2d3198" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="gradle-node-plugin-7.1.0.module">
+            <sha256 value="6cf277b82986e413210de0e3e4fe9c109c7bdaa5169d48cfed526d06a1c3d0b0" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="com.github.node-gradle.node" name="com.github.node-gradle.node.gradle.plugin" version="7.1.0">
+         <artifact name="com.github.node-gradle.node.gradle.plugin-7.1.0.pom">
+            <sha256 value="dc0e8e782ba0dac5c4d0d8678081c11380a5c793b3c46f2d0f8d242d1733b62b" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.spotbugs" name="com.github.spotbugs.gradle.plugin" version="6.0.4">
          <artifact name="com.github.spotbugs.gradle.plugin-6.0.4.pom">
             <sha256 value="f029abeb54aa13d5631ece27f58f2e20039cb28b9ce3b1b314947af5b06d8a65" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -822,6 +835,29 @@
             <sha256 value="d8531a746c988f7f68ed5f188cdea945006aea993ec5df9e524e0d27d61491da" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.nodejs" name="node" version="25.1.0">
+         <artifact name="node-25.1.0-darwin-arm64.tar.gz">
+            <sha256 value="811dcf54580d9eef0abfed9f65457545d2aac8e24853b6e638194fcba0257168" origin="https://nodejs.org/dist/v25.1.0/SHASUMS256.txt" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="node-25.1.0-darwin-x64.tar.gz">
+            <sha256 value="5c2d45214e70327e683df301eeb11d8fc9265ab22ad41ff6335e4a7befc07169" origin="https://nodejs.org/dist/v25.1.0/SHASUMS256.txt" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="node-25.1.0-linux-arm64.tar.gz">
+            <sha256 value="9cc83fc5dfdc36692aabec37ab1c6d070d11c44f02764b5e50777491552e8449" origin="https://nodejs.org/dist/v25.1.0/SHASUMS256.txt" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="node-25.1.0-linux-s390x.tar.gz">
+            <sha256 value="bdd93b9ce06a6e6bcdc0af9d838b9861cbcb4271481f5c5bd4e965601bc5b155" origin="https://nodejs.org/dist/v25.1.0/SHASUMS256.txt" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="node-25.1.0-linux-x64.tar.gz">
+            <sha256 value="0b8de924cd43546a2098c091b73002442cd61340622b2c1489df408755de21fc" origin="https://nodejs.org/dist/v25.1.0/SHASUMS256.txt" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="node-25.1.0-win-arm64.zip">
+            <sha256 value="8063f6caa9f865cd1ddc30b7bccb6ddb457b7cac0d61e30e74ff85b97b32673b" origin="https://nodejs.org/dist/v25.1.0/SHASUMS256.txt" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="node-25.1.0-win-x64.zip">
+            <sha256 value="abab8d2fff33dad361e51b51dfadd1f8aaef8677f88d21e3cccaf7b6e6f46339" origin="https://nodejs.org/dist/v25.1.0/SHASUMS256.txt" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.nosphere.apache" name="creadur-rat-gradle" version="0.8.1">
          <artifact name="creadur-rat-gradle-0.8.1.jar">
             <sha256 value="c1a58cbbe3d0a5e207cd90e79a9e22c9eb01d9e77f7313f4f5aa7d9e478a0550" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -18,6 +18,7 @@
 pluginManagement {
     plugins {
         id("com.github.vlsi.stage-vote-release") version "2.0.0"
+        id("com.github.node-gradle.node") version "7.1.0"
     }
 }
 
@@ -32,6 +33,20 @@ dependencyResolutionManagement {
     repositories {
         // TODO: support enableMavenLocal
         mavenCentral()
+        // Declare the Node.js download repository
+        ivy {
+            name = "Node.js"
+            setUrl("https://nodejs.org/dist/")
+            patternLayout {
+                artifact("v[revision]/[artifact](-v[revision]-[classifier]).[ext]")
+            }
+            metadataSources {
+                artifact()
+            }
+            content {
+                includeModule("org.nodejs", "node")
+            }
+        }
     }
 }
 
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java
@@ -17,6 +17,7 @@
 
 package org.apache.jmeter.assertions;
 
+import static org.apache.jmeter.assertions.AssertionResultExtensionsKt.assertEnFailureMessageContains;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -99,7 +100,7 @@ public void testAssertionBadXSDFile() throws Exception {
         AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
         testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
         testLog.debug("failure " + res.getFailureMessage());
-        assertTrue(res.getFailureMessage().indexOf("Failed to read schema document") > 0);
+        assertEnFailureMessageContains(res, "Failed to read schema document");
         assertTrue(res.isError());// TODO - should this be a failure?
         assertFalse(res.isFailure());
     }
@@ -147,7 +148,7 @@ public void testAssertionBlankResult() throws Exception {
         AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
         testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
         testLog.debug("failure " + res.getFailureMessage());
-        assertTrue(res.getFailureMessage().indexOf("Premature end of file") > 0);
+        assertEnFailureMessageContains(res, "Premature end of file");
         assertTrue(res.isError());
         assertFalse(res.isFailure());
     }
@@ -162,7 +163,7 @@ public void testXMLTrailingContent() throws Exception {
         AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
         testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
         testLog.debug("failure " + res.getFailureMessage());
-        assertTrue(res.getFailureMessage().indexOf("Content is not allowed in trailing section") > 0);
+        assertEnFailureMessageContains(res, "Content is not allowed in trailing section");
         assertTrue(res.isError());
         assertFalse(res.isFailure());
     }
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/XPathAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/XPathAssertionTest.java
@@ -17,6 +17,7 @@
 
 package org.apache.jmeter.assertions;
 
+import static org.apache.jmeter.assertions.AssertionResultExtensionsKt.assertEnFailureMessageContains;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -271,7 +272,7 @@ public void testAssertionBlankResult() throws Exception {
         AssertionResult res = assertion.getResult(result);
         testLog.debug("isError() {} isFailure() {}", res.isError(), res.isFailure());
         testLog.debug("failure message: {}", res.getFailureMessage());
-        assertTrue(res.getFailureMessage().indexOf("Premature end of file") > 0);
+        assertEnFailureMessageContains(res, "Premature end of file");
         assertTrue(res.isError(), "Should be an error");
         assertFalse(res.isFailure(), "Should not be a failure");
     }
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/XmlAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/XmlAssertionTest.java
@@ -17,6 +17,8 @@
 
 package org.apache.jmeter.assertions;
 
+import static org.apache.jmeter.assertions.AssertionResultExtensionsKt.assertEnFailureMessageContains;
+import static org.apache.jmeter.assertions.AssertionResultExtensionsKt.assertFailureMessageContains;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -62,8 +64,7 @@ public void testUnsecureX() throws Exception {
         result = assertion.getResult(sampleResult);
         assertTrue(result.isFailure());
         assertTrue(result.isError());
-        assertEquals("DOCTYPE is disallowed when the feature \"http://apache.org/xml/features/disallow-doctype-decl\" set to true.",
-                    result.getFailureMessage());
+        assertFailureMessageContains(result, "http://apache.org/xml/features/disallow-doctype-decl");
     }
 
     @Test
@@ -91,6 +92,6 @@ public void testNoXML() throws Exception {
         assertTrue(result.isFailure());
         assertTrue(result.isError());
         assertNotNull(result.getFailureMessage());
-        assertTrue(result.getFailureMessage().contains("Content is not allowed in prolog"));
+        assertEnFailureMessageContains(result, "Content is not allowed in prolog");
     }
 }
diff --git a/src/components/src/test/java/org/apache/jmeter/extractor/TestXPathExtractor.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestXPathExtractor.java
@@ -17,6 +17,7 @@
 
 package org.apache.jmeter.extractor;
 
+import static org.apache.jmeter.assertions.AssertionResultExtensionsKt.assertEnFailureMessageContains;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -276,13 +277,7 @@ public void testInvalidXpath() throws Exception {
                 firstResult.getFailureMessage(),
                 "<",
                 "'<' is an invalid character in xpath, so it is expected to be present in the error message");
-        if (Locale.getDefault().getLanguage().startsWith(Locale.ENGLISH.getLanguage())) {
-            assertContains(
-                    firstResult.getFailureMessage(),
-                    "A location path was expected, but the following token was encountered",
-                    ""
-            );
-        }
+        assertEnFailureMessageContains(firstResult, "A location path was expected, but the following token was encountered");
         assertEquals("Default", vars.get(VAL_NAME));
         assertEquals("0", vars.get(VAL_NAME_NR));
     }
@@ -294,9 +289,9 @@ public void testNonXmlDocument() throws Exception {
         extractor.process();
         assertEquals(1, result.getAssertionResults().length);
         assertEquals(extractor.getName(), result.getAssertionResults()[0].getName());
-        assertContains(result.getAssertionResults()[0].getFailureMessage(),
-                "Content is not allowed in prolog",
-                "");
+        assertEnFailureMessageContains(
+            result.getAssertionResults()[0],
+            "Content is not allowed in prolog");
         assertEquals("Default", vars.get(VAL_NAME));
         assertEquals("0", vars.get(VAL_NAME_NR));
     }
@@ -309,10 +304,9 @@ public void testInvalidDocument() throws Exception {
 
         assertEquals(1, result.getAssertionResults().length);
         assertEquals(extractor.getName(), result.getAssertionResults()[0].getName());
-        assertContains(result.getAssertionResults()[0].getFailureMessage(),
-                "XML document structures must start and end within the same entity",
-                "");
-
+        assertEnFailureMessageContains(
+                result.getAssertionResults()[0],
+                "XML document structures must start and end within the same entity");
         assertEquals("Default", vars.get(VAL_NAME));
         assertEquals("0", vars.get(VAL_NAME_NR));
     }
diff --git a/src/components/src/test/java/org/apache/jmeter/gui/action/template/TestTemplateManager.java b/src/components/src/test/java/org/apache/jmeter/gui/action/template/TestTemplateManager.java
@@ -112,7 +112,9 @@ public void testInvalidTemplateXml() throws IOException, SAXException, ParserCon
             TemplateManager.getInstance().parseTemplateFile(templateFile);
         } catch (SAXParseException ex) {
             String message = ex.getMessage();
-            assertTrue(message.contains("Element type \"key\" must be declared."), "Exception did not contains expected message, got:" + message);
+            assertTrue(
+                    message.contains("\"key\""),
+                    "Exception did not contains expected message (e.g. Element type \"key\" must be declared.), got:" + message);
         }
     }
 
diff --git a/src/components/src/test/kotlin/org/apache/jmeter/assertions/AssertionResultExtensions.kt b/src/components/src/test/kotlin/org/apache/jmeter/assertions/AssertionResultExtensions.kt
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.assertions
+
+import org.junit.jupiter.api.Assertions.assertTrue
+import java.util.Locale
+
+fun AssertionResult.assertEnFailureMessageContains(substring: String) {
+    if (Locale.getDefault().language.startsWith(Locale.ENGLISH.language)) {
+        assertFailureMessageContains(substring)
+    }
+}
+
+fun AssertionResult.assertFailureMessageContains(substring: String) {
+    val failureMessage = getFailureMessage()
+    assertTrue(failureMessage.contains(substring)) {
+        "expected failure message to contain <<$substring>> but got <<$failureMessage>>"
+    }
+}
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
diff --git a/xdocs/package-lock.json b/xdocs/package-lock.json
diff --git a/xdocs/package.json b/xdocs/package.json
diff --git a/xdocs/stylesheets/website-style.xsl b/xdocs/stylesheets/website-style.xsl
diff --git a/xdocs/yarn.lock b/xdocs/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,9 @@ public void testInvalidTemplateXml() throws IOException, SAXException, ParserCon`
`112`	`112`	`TemplateManager.getInstance().parseTemplateFile(templateFile);`
`113`	`113`	`} catch (SAXParseException ex) {`
`114`	`114`	`String message = ex.getMessage();`
`115`		`- assertTrue(message.contains("Element type \"key\" must be declared."), "Exception did not contains expected message, got:" + message);`
	`115`	`+ assertTrue(`
	`116`	`+ message.contains("\"key\""),`
	`117`	`+ "Exception did not contains expected message (e.g. Element type \"key\" must be declared.), got:" + message);`
`116`	`118`	`}`
`117`	`119`	`}`
`118`	`120`