CI: Update Mimir steps (#11169)

Initial step was not cached, so m-wrapper-p and Maven distro was always pulled from MC.

Changes:
* using Mimir 0.9.3
* centralized Mimir config
* using provided infusers

After this, ~there is only one thing not cached: Mimir extension itself~ not anymore 😉

Author: cstamas

.github/ci-extensions.xml

@@ -21,6 +21,6 @@ under the License.
   <extension>
     <groupId>eu.maveniverse.maven.mimir</groupId>
     <artifactId>extension3</artifactId>
-    <version>0.8.1</version>
+    <version>${env.MIMIR_VERSION}</version>
   </extension>
 </extensions>

.github/ci-mimir-daemon.properties

@@ -17,5 +17,5 @@
 
 # Mimir Daemon config properties
 
-# Disable JGroups; we don't want/use LAN cache sharing
-mimir.jgroups.enabled=false
+# Pre-seed itself
+mimir.daemon.preSeedItself=true

.github/ci-mimir-session.properties

@@ -0,0 +1,21 @@
+#
+#  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.
+#
+
+# Mimir Session config properties
+
+# do not waste time on this; we maintain the version
+mimir.daemon.autoupdate=false

.github/workflows/maven.yml

@@ -31,6 +31,11 @@ concurrency:
 # clear all permissions for GITHUB_TOKEN
 permissions: {}
 
+env:
+  MIMIR_VERSION: 0.9.3
+  MIMIR_BASEDIR: ~/.mimir
+  MIMIR_LOCAL: ~/.mimir/local
+
 jobs:
   initial-build:
     runs-on: ubuntu-latest
@@ -46,23 +51,31 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Prepare Mimir
+      - name: Prepare Mimir for Maven 3.x
         shell: bash
         run: |
-          mkdir -p ~/.mimir
-          cp .github/ci-extensions.xml ~/.m2/extensions.xml
-          cp .github/ci-mimir-daemon.properties ~/.mimir/daemon.properties
+          mkdir -p ${{ env.MIMIR_BASEDIR }}
+          cp .github/ci-mimir-session.properties ${{ env.MIMIR_BASEDIR }}/session.properties
+          cp .github/ci-mimir-daemon.properties ${{ env.MIMIR_BASEDIR }}/daemon.properties
+          cp .github/ci-extensions.xml .mvn/extensions.xml
 
       - name: Restore Mimir caches
         uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
         id: restore-cache
         with:
-          path: ~/.mimir/local
+          path: ${{ env.MIMIR_LOCAL }}
           key: mimir-${{ runner.os }}-initial
 
       - name: Set up Maven
         shell: bash
-        run: mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.2:wrapper "-Dmaven=4.0.0-rc-3"
+        run: mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.4:wrapper "-Dmaven=4.0.0-rc-4"
+
+      - name: Prepare Mimir for Maven 4.x
+        shell: bash
+        run: |
+          rm .mvn/extensions.xml
+          mkdir -p ~/.m2
+          cp .github/ci-extensions.xml ~/.m2/extensions.xml
 
       - name: Build Maven distributions
         shell: bash
@@ -76,7 +89,7 @@ jobs:
         uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
         if: ${{ github.event_name != 'pull_request' && !cancelled() && !failure() }}
         with:
-          path: ~/.mimir/local
+          path: ${{ env.MIMIR_LOCAL }}
           key: ${{ steps.restore-cache.outputs.cache-primary-key }}
 
       - name: Upload Maven distributions
@@ -119,19 +132,20 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Prepare Mimir
+      - name: Prepare Mimir for Maven 4.x
         shell: bash
         run: |
+          mkdir -p ${{ env.MIMIR_BASEDIR }}
+          cp .github/ci-mimir-session.properties ${{ env.MIMIR_BASEDIR }}/session.properties
+          cp .github/ci-mimir-daemon.properties ${{ env.MIMIR_BASEDIR }}/daemon.properties
           mkdir -p ~/.m2
-          mkdir -p ~/.mimir
           cp .github/ci-extensions.xml ~/.m2/extensions.xml
-          cp .github/ci-mimir-daemon.properties ~/.mimir/daemon.properties
 
       - name: Restore Mimir caches
         uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
         id: restore-cache
         with:
-          path: ~/.mimir/local
+          path: ${{ env.MIMIR_LOCAL }}
           key: mimir-full-${{ matrix.os }}-${{ matrix.java }}
           restore-keys: |
             mimir-full-${{ matrix.os }}-
@@ -176,7 +190,7 @@ jobs:
         uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
         if: ${{ github.event_name != 'pull_request' && !cancelled() && !failure() }}
         with:
-          path: ~/.mimir/local
+          path: ${{ env.MIMIR_LOCAL }}
           key: ${{ steps.restore-cache.outputs.cache-primary-key }}
 
       - name: Upload test artifacts
@@ -206,19 +220,20 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Prepare Mimir
+      - name: Prepare Mimir for Maven 4.x
         shell: bash
         run: |
+          mkdir -p ${{ env.MIMIR_BASEDIR }}
+          cp .github/ci-mimir-session.properties ${{ env.MIMIR_BASEDIR }}/session.properties
+          cp .github/ci-mimir-daemon.properties ${{ env.MIMIR_BASEDIR }}/daemon.properties
           mkdir -p ~/.m2
-          mkdir -p ~/.mimir
           cp .github/ci-extensions.xml ~/.m2/extensions.xml
-          cp .github/ci-mimir-daemon.properties ~/.mimir/daemon.properties
 
       - name: Restore Mimir caches
         uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
         id: restore-cache
         with:
-          path: ~/.mimir/local
+          path: ${{ env.MIMIR_LOCAL }}
           key: mimir-its-${{ matrix.os }}-${{ matrix.java }}
           restore-keys: |
             mimir-its-${{ matrix.os }}-
@@ -259,7 +274,7 @@ jobs:
         uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
         if: ${{ github.event_name != 'pull_request' && !cancelled() && !failure() }}
         with:
-          path: ~/.mimir/local
+          path: ${{ env.MIMIR_LOCAL }}
           key: ${{ steps.restore-cache.outputs.cache-primary-key }}
 
       - name: Upload test artifacts

impl/maven-cli/pom.xml

@@ -235,15 +235,14 @@ under the License.
       <artifactId>jline-native</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>eu.maveniverse.maven.mimir</groupId>
+      <artifactId>testing</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
-    <testResources>
-      <testResource>
-        <filtering>true</filtering>
-        <directory>src/test/resources-filtered</directory>
-      </testResource>
-    </testResources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/MavenInvokerTestSupport.java

@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.Map;
 
+import eu.maveniverse.maven.mimir.testing.MimirInfuser;
 import org.apache.maven.api.cli.Invoker;
 import org.apache.maven.api.cli.Parser;
 import org.apache.maven.api.cli.ParserRequest;
@@ -98,7 +99,7 @@ protected Map<String, String> invoke(Path cwd, Path userHome, Collection<String>
         Files.createDirectories(appJava.getParent());
         Files.writeString(appJava, APP_JAVA_STRING);
 
-        MimirInfuser.infuse(userHome);
+        MimirInfuser.infuseUW(userHome);
 
         HashMap<String, String> logs = new HashMap<>();
         Parser parser = createParser();

impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/MimirInfuser.java

@@ -53,6 +53,11 @@ under the License.
       <artifactId>junit-jupiter-params</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>eu.maveniverse.maven.mimir</groupId>
+      <artifactId>testing</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>apache-maven</artifactId>
@@ -70,12 +75,6 @@ under the License.
   </dependencies>
 
   <build>
-    <testResources>
-      <testResource>
-        <filtering>true</filtering>
-        <directory>src/test/resources-filtered</directory>
-      </testResource>
-    </testResources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

impl/maven-cli/src/test/resources-filtered/ut-mimir.properties

@@ -26,6 +26,7 @@
 import java.util.Collection;
 import java.util.List;
 
+import eu.maveniverse.maven.mimir.testing.MimirInfuser;
 import org.apache.maven.api.annotations.Nullable;
 import org.apache.maven.api.cli.Executor;
 import org.apache.maven.api.cli.ExecutorRequest;
@@ -316,7 +317,7 @@ public static void main(String... args) {
     protected void execute(@Nullable Path logFile, Collection<ExecutorRequest> requests) throws Exception {
         Executor invoker = createAndMemoizeExecutor();
         for (ExecutorRequest request : requests) {
-            MimirInfuser.infuse(request.userHomeDirectory());
+            MimirInfuser.infuseUW(request.userHomeDirectory());
             int exitCode = invoker.execute(request);
             if (exitCode != 0) {
                 throw new FailedExecution(request, exitCode, logFile == null ? "" : Files.readString(logFile));