From 1dc1df72d1a7bf9173bd339c3fba460cd68d6519 Mon Sep 17 00:00:00 2001
From: Bruce Collie <brucecollie82@gmail.com>
Date: Fri, 3 Nov 2023 14:02:38 +0000
Subject: [PATCH] Run `mvn verify` with appropriate number of cores (#3790)

The parallelism in this job (which runs in CI) has been set to 12 cores
for years; this is unlikely to be a globally optimal choice and so we
should instead look at how many cores are available when running the job
(using [this Maven
plugin](https://www.mojohaus.org/build-helper-maven-plugin/cpu-count-mojo.html)).

---------

Co-authored-by: devops <devops@runtimeverification.com>
Co-authored-by: rv-jenkins <admin@runtimeverification.com>
---
 k-distribution/pom.xml | 15 ++++++++++++++-
 nix/mavenix.lock       | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/k-distribution/pom.xml b/k-distribution/pom.xml
index 524f1395b95..bdca2962218 100644
--- a/k-distribution/pom.xml
+++ b/k-distribution/pom.xml
@@ -46,6 +46,19 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>3.4.0</version>
+        <executions>
+          <execution>
+            <id>get-cpu-count</id>
+            <goals>
+              <goal>cpu-count</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>net.alchim31.maven</groupId>
         <artifactId>scala-maven-plugin</artifactId>
@@ -108,7 +121,7 @@
             <configuration>
               <target>
                 <exec dir="${ktestDir}" executable="make" failonerror="true">
-                  <arg value="-j12" />
+                  <arg value="-j${cpu.count}" />
                   <arg line="${make.args}" />
                 </exec>
               </target>
diff --git a/nix/mavenix.lock b/nix/mavenix.lock
index cd9f373805e..97663fd343a 100644
--- a/nix/mavenix.lock
+++ b/nix/mavenix.lock
@@ -1573,6 +1573,14 @@
       "path": "org/antlr/stringtemplate/3.2/stringtemplate-3.2.pom",
       "sha1": "a21993ca994a2927e1e43adfbb3a8d92d131fc80"
     },
+    {
+      "path": "org/apache-extras/beanshell/bsh/2.0b6/bsh-2.0b6.jar",
+      "sha1": "fb418f9b33a0b951e9a2978b4b6ee93b2707e72f"
+    },
+    {
+      "path": "org/apache-extras/beanshell/bsh/2.0b6/bsh-2.0b6.pom",
+      "sha1": "ef6b86a126ae192d8639af6f5b3dbe5d4c6d7dde"
+    },
     {
       "path": "org/apache/ant/ant-launcher/1.8.1/ant-launcher-1.8.1.pom",
       "sha1": "436b71817fb83bb7a162a22b1aadebe0a2910133"
@@ -4225,6 +4233,14 @@
       "path": "org/apache/maven/shared/file-management/3.0.0/file-management-3.0.0.pom",
       "sha1": "f6d55739cb1a70aef37b345b89cdd9d4f53ed637"
     },
+    {
+      "path": "org/apache/maven/shared/file-management/3.1.0/file-management-3.1.0.jar",
+      "sha1": "f87a3a54c856714e4157b9ce7a5ff6ffc310d447"
+    },
+    {
+      "path": "org/apache/maven/shared/file-management/3.1.0/file-management-3.1.0.pom",
+      "sha1": "8c2dcedec327bbb9daf24ced48fc59ce228a6b1f"
+    },
     {
       "path": "org/apache/maven/shared/maven-artifact-transfer/0.13.1/maven-artifact-transfer-0.13.1.jar",
       "sha1": "9f6d2088ae64dd926b8ec445afdb7e148eb08060"
@@ -5021,6 +5037,14 @@
       "path": "org/codehaus/groovy/groovy-all/1.7.6/groovy-all-1.7.6.pom",
       "sha1": "f9f2e45942b25bfded764cce615156228e7b8a3a"
     },
+    {
+      "path": "org/codehaus/mojo/build-helper-maven-plugin/3.4.0/build-helper-maven-plugin-3.4.0.jar",
+      "sha1": "542285128a4510fbe9e59b43f11407e01e530edc"
+    },
+    {
+      "path": "org/codehaus/mojo/build-helper-maven-plugin/3.4.0/build-helper-maven-plugin-3.4.0.pom",
+      "sha1": "6bfad437d7b5848928c5610c931f8a6b53acd0f6"
+    },
     {
       "path": "org/codehaus/mojo/buildnumber-maven-plugin/1.3/buildnumber-maven-plugin-1.3.jar",
       "sha1": "a87082dcc28b7ff61412c3e59dac2ae2748393a1"
@@ -5057,6 +5081,10 @@
       "path": "org/codehaus/mojo/mojo-parent/40/mojo-parent-40.pom",
       "sha1": "d2fa7c95447827e9bbcb8c60bd9484c51202732e"
     },
+    {
+      "path": "org/codehaus/mojo/mojo-parent/74/mojo-parent-74.pom",
+      "sha1": "2ef0a93fea172659305d787e51dfd4af9247334c"
+    },
     {
       "path": "org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar",
       "sha1": "b564a05aeecd4d81d6b81f57a1d495fc8c0f497f"
@@ -5741,6 +5769,14 @@
       "path": "org/codehaus/plexus/plexus-utils/3.4.2/plexus-utils-3.4.2.pom",
       "sha1": "2e7d0c48e7888250f5ecf22634fc7be5a9743e69"
     },
+    {
+      "path": "org/codehaus/plexus/plexus-utils/3.5.1/plexus-utils-3.5.1.jar",
+      "sha1": "c6bfb17c97ecc8863e88778ea301be742c62b06d"
+    },
+    {
+      "path": "org/codehaus/plexus/plexus-utils/3.5.1/plexus-utils-3.5.1.pom",
+      "sha1": "9b1bf6967abaa0a516a04ea096da08ec8d8fe0d7"
+    },
     {
       "path": "org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar",
       "sha1": "1440fc2552d1405b1c2d380ef3b96c4d9c6dbd0b"
@@ -6097,6 +6133,10 @@
       "path": "org/junit/junit-bom/5.7.2/junit-bom-5.7.2.pom",
       "sha1": "e8848369738c03e40af5507686216f9b8b44b6a3"
     },
+    {
+      "path": "org/junit/junit-bom/5.9.2/junit-bom-5.9.2.pom",
+      "sha1": "645a08cbe455cad14d8bfb25a35d7f594c53cafd"
+    },
     {
       "path": "org/kframework/dependencies/nailgun-all/1.0.0-SNAPSHOT/nailgun-all-1.0.0-20230818.165756-2.pom",
       "sha1": "81f6a397361513f34b26d5f43d329df888f2feaa"