Merge branch 'master' into url-depreciation-1

jenkinsci · Oct 7, 2023 · c2bb399 · c2bb399
2 parents 45e18a9 + 9fd645a
commit c2bb399
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/core/src/main/resources/hudson/model/UsageStatistics/global.groovy b/core/src/main/resources/hudson/model/UsageStatistics/global.groovy
@@ -12,7 +12,9 @@ f.section(title: _("Usage Statistics")) {
             raw(_("disabledBySystemProperty"))
         }
     } else if (FIPS140.useCompliantAlgorithms()) {
-        f.optionalBlock(field: "usageStatisticsCollected", checked: app.usageStatisticsCollected, title: _("statsBlurbFIPS"))
+        f.optionalBlock(field: "usageStatisticsCollected", checked: app.usageStatisticsCollected, title: _("statsBlurbFIPS")) {
+            f.description(_("statsDescriptionFIPS"))
+        }
     } else {
         f.optionalBlock(field: "usageStatisticsCollected", checked: app.usageStatisticsCollected, title: _("statsBlurb"))
     }

diff --git a/core/src/main/resources/hudson/model/UsageStatistics/global.properties b/core/src/main/resources/hudson/model/UsageStatistics/global.properties
@@ -24,6 +24,8 @@ statsBlurb=\
   Help make Jenkins better by sending anonymous usage statistics and crash reports to the Jenkins project
 statsBlurbFIPS=\
   Help make Jenkins better by sending telemetry to the Jenkins project
+statsDescriptionFIPS=\
+  General usage statistics are not submitted when FIPS-140 compliance is requested.
 disabledBySystemProperty=\
   The option to send anonymous usage statistics, crash reports and telemetry to the Jenkins project is disabled by a <a href="https://www.jenkins.io/doc/book/managing/system-properties/#hudson-model-usagestatistics-disabled">System Property</a>.
 
diff --git a/war/package.json b/war/package.json
@@ -62,5 +62,5 @@
     "defaults",
     "not IE 11"
   ],
-  "packageManager": "[email protected].3"
+  "packageManager": "[email protected].4"
 }
diff --git a/war/pom.xml b/war/pom.xml
@@ -50,8 +50,8 @@ THE SOFTWARE.
     <!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
     <yarn.version>1.22.19</yarn.version>
     <!-- maven-antrun-plugin will download this Yarn version. -->
-    <yarn-berry.version>3.6.3</yarn-berry.version>
-    <yarn-berry.sha256sum>08ead1821a257416e6f217e89365425bf4b6d2430c3279318bedcec1a245fff5</yarn-berry.sha256sum>
+    <yarn-berry.version>3.6.4</yarn-berry.version>
+    <yarn-berry.sha256sum>7f7d51b38db0d94adf25c512e3f3d3b47d23c97922eecc540f7440f116bdb99a</yarn-berry.sha256sum>
   </properties>
 
   <dependencyManagement>