Fix inputsource jdk26

.github/ci-extensions.xml

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

.github/ci-mimir-daemon.properties

@@ -15,7 +15,9 @@
 #  limitations under the License.
 #
 
-# Mimir Daemon properties
+# 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
+mimir.file.exclusiveAccess=true
+mimir.file.cachePurge=ON_BEGIN

.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

@@ -19,47 +19,66 @@ name: Java CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ maven-4.0.x ]
   pull_request:
-    branches: [ master ]
+    branches: [ maven-4.0.x ]
+
+# allow single build per branch or PR
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 # clear all permissions for GITHUB_TOKEN
 permissions: {}
 
+env:
+  MIMIR_VERSION: 0.10.6
+  MIMIR_BASEDIR: ~/.mimir
+  MIMIR_LOCAL: ~/.mimir/local
+  MAVEN_OPTS: -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/java_heapdump.hprof
+
 jobs:
   initial-build:
     runs-on: ubuntu-latest
     steps:
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
         with:
           java-version: 17
           distribution: 'temurin'
 
       - name: Checkout maven
-        uses: actions/checkout@v4
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         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: Handle Mimir caches
-        uses: actions/cache@v4
+      - name: Restore Mimir caches
+        uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
         with:
-          path: ~/.mimir/local
-          key: mimir-${{ runner.os }}-initial-${{ hashFiles('**/pom.xml') }}
+          path: ${{ env.MIMIR_LOCAL }}
+          key: mvn40-${{ runner.os }}-${{ github.run_id }}
           restore-keys: |
-            mimir-${{ runner.os }}-initial-
-            mimir-${{ runner.os }}-
+            mvn40-${{ runner.os }}-
+            mvn40-
 
       - 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
@@ -69,25 +88,53 @@ jobs:
         shell: bash
         run: ls -la apache-maven/target
 
+      - name: Upload Mimir caches
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        if: ${{ !cancelled() && !failure() }}
+        with:
+          name: cache-${{ runner.os }}-initial
+          retention-days: 1
+          path: ${{ env.MIMIR_LOCAL }}
+
       - name: Upload Maven distributions
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: maven-distributions
           path: |
             apache-maven/target/apache-maven*.zip
             apache-maven/target/apache-maven*.tar.gz
 
+      - name: Upload test artifacts
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        if: ${{ failure() || cancelled() }}
+        with:
+          name: initial-logs
+          retention-days: 1
+          path: |
+            **/target/surefire-reports/*
+            **/target/java_heapdump.hprof
+
+      - name: Upload Mimir logs
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        if: always()
+        with:
+          name: initial-mimir-logs
+          include-hidden-files: true
+          retention-days: 1
+          path: |
+            ~/.mimir/*.log
+
   full-build:
     needs: initial-build
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java: ['17', '21', '24']
+        java: ['17', '21', '25']
     steps:
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
@@ -105,29 +152,30 @@ jobs:
         run: choco install graphviz
 
       - name: Checkout maven
-        uses: actions/checkout@v4
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         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: Handle Mimir caches
-        uses: actions/cache@v4
+      - name: Restore Mimir caches
+        uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
         with:
-          path: ~/.mimir/local
-          key: mimir-${{ runner.os }}-full-${{ hashFiles('**/pom.xml') }}
+          path: ${{ env.MIMIR_LOCAL }}
+          key: mvn40-${{ runner.os }}-${{ github.run_id }}
           restore-keys: |
-            mimir-${{ runner.os }}-full-
-            mimir-${{ runner.os }}-
+            mvn40-${{ runner.os }}-
+            mvn40-
 
       - name: Download Maven distribution
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: maven-distributions
           path: maven-dist
@@ -153,10 +201,6 @@ jobs:
           echo "MAVEN_HOME=$PWD/maven-local" >> $GITHUB_ENV
           echo "$PWD/maven-local/bin" >> $GITHUB_PATH
 
-      - name: Show IP
-        shell: bash
-        run: curl --silent https://api.ipify.org
-
       - name: Build with downloaded Maven
         shell: bash
         run: mvn verify -Papache-release -Dgpg.skip=true -e -B -V
@@ -165,12 +209,33 @@ jobs:
         shell: bash
         run: mvn site -e -B -V -Preporting
 
+      - name: Upload Mimir caches
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        if: ${{ !cancelled() && !failure() }}
+        with:
+          name: cache-${{ runner.os }}-full-build-${{ matrix.java }}
+          retention-days: 1
+          path: ${{ env.MIMIR_LOCAL }}
+
       - name: Upload test artifacts
-        uses: actions/upload-artifact@v4
-        if: failure()
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        if: failure() || cancelled()
         with:
-          name: ${{ github.run_number }}-full-build-artifact-${{ runner.os }}-${{ matrix.java }}
-          path: '**/target/surefire-reports/*'
+          name: full-build-logs-${{ runner.os }}-${{ matrix.java }}
+          retention-days: 1
+          path: |
+            **/target/surefire-reports/*
+            **/target/java_heapdump.hprof
+
+      - name: Upload Mimir logs
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        if: always()
+        with:
+          name: full-build-mimir-logs-${{ runner.os }}-${{ matrix.java }}
+          include-hidden-files: true
+          retention-days: 1
+          path: |
+            ~/.mimir/*.log
 
   integration-tests:
     needs: initial-build
@@ -179,38 +244,39 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java: ['17', '21', '24']
+        java: ['17', '21', '25']
     steps:
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
 
       - name: Checkout maven
-        uses: actions/checkout@v4
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         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: Handle Mimir caches
-        uses: actions/cache@v4
+      - name: Restore Mimir caches
+        uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
         with:
-          path: ~/.mimir/local
-          key: mimir-${{ runner.os }}-its-${{ hashFiles('**/pom.xml') }}
+          path: ${{ env.MIMIR_LOCAL }}
+          key: mvn40-${{ runner.os }}-${{ github.run_id }}
           restore-keys: |
-            mimir-${{ runner.os }}-its-
-            mimir-${{ runner.os }}-
+            mvn40-${{ runner.os }}-
+            mvn40-
 
       - name: Download Maven distribution
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: maven-distributions
           path: maven-dist
@@ -236,17 +302,59 @@ jobs:
           echo "MAVEN_HOME=$PWD/maven-local" >> $GITHUB_ENV
           echo "$PWD/maven-local/bin" >> $GITHUB_PATH
 
-      - name: Show IP
-        shell: bash
-        run: curl --silent https://api.ipify.org
-
       - name: Build Maven and ITs and run them
         shell: bash
         run: mvn install -e -B -V -Prun-its,mimir
 
+      - name: Upload Mimir caches
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        if: ${{ !cancelled() && !failure() }}
+        with:
+          name: cache-${{ runner.os }}-integration-tests-${{ matrix.java }}
+          retention-days: 1
+          path: ${{ env.MIMIR_LOCAL }}
+
       - name: Upload test artifacts
-        uses: actions/upload-artifact@v4
-        if: failure()
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        if: ${{ failure() || cancelled() }}
+        with:
+          name: integration-test-logs-${{ runner.os }}-${{ matrix.java }}
+          retention-days: 1
+          path: |
+            **/target/surefire-reports/*
+            **/target/failsafe-reports/*
+            ./its/core-it-suite/target/test-classes/**
+            **/target/java_heapdump.hprof
+
+      - name: Upload Mimir logs
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        if: always()
+        with:
+          name: integration-test-mimir-logs-${{ runner.os }}-${{ matrix.java }}
+          include-hidden-files: true
+          retention-days: 1
+          path: |
+            ~/.mimir/*.log
+
+  consolidate-caches:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    needs:
+      - full-build
+      - integration-tests
+    steps:
+      - name: Download Caches
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        with:
+          merge-multiple: true
+          pattern: 'cache-${{ runner.os }}*'
+          path: ${{ env.MIMIR_LOCAL }}
+      - name: Publish cache
+        uses: actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        if: ${{ github.event_name != 'pull_request' && !cancelled() && !failure() }}
         with:
-          name: ${{ github.run_number }}-integration-test-artifact-${{ runner.os }}-${{ matrix.java }}
-          path: ./its/core-it-suite/target/test-classes/
+          path: ${{ env.MIMIR_LOCAL }}
+          key: mvn40-${{ runner.os }}-${{ github.run_id }}