This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new e885d05442 Update Mimir to 0.7.8 (#2416)
e885d05442 is described below
commit e885d05442a0edec8723adfe5127758283a949f6
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Wed Jun 4 12:37:54 2025 +0200
Update Mimir to 0.7.8 (#2416)
And set up them properly to use outer daemon.
Release notes:
https://github.com/maveniverse/mimir/releases/tag/release-0.7.8
---
.github/ci-extensions.xml | 2 +-
impl/maven-cli/pom.xml | 6 ++++++
.../test/java/org/apache/maven/cling/invoker/mvn/MimirInfuser.java | 7 +++++++
.../src/test/resources-filtered/ut-mimir.properties | 2 +-
.../test/java/org/apache/maven/cling/executor/MimirInfuser.java | 2 +-
.../maven-executor/src/test/resources-filtered/ut-mimir.properties | 4 ++--
its/core-it-suite/src/test/resources-filtered/it-mimir.properties | 2 +-
7 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/.github/ci-extensions.xml b/.github/ci-extensions.xml
index 9bf530f896..5c6a0b4378 100644
--- a/.github/ci-extensions.xml
+++ b/.github/ci-extensions.xml
@@ -21,6 +21,6 @@ under the License.
<extension>
<groupId>eu.maveniverse.maven.mimir</groupId>
<artifactId>extension</artifactId>
- <version>0.5.0</version>
+ <version>0.7.8</version>
</extension>
</extensions>
\ No newline at end of file
diff --git a/impl/maven-cli/pom.xml b/impl/maven-cli/pom.xml
index 4ab36ecf7e..48394de772 100644
--- a/impl/maven-cli/pom.xml
+++ b/impl/maven-cli/pom.xml
@@ -234,6 +234,12 @@ 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>
diff --git
a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/MimirInfuser.java
b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/MimirInfuser.java
index 56bbb570ca..2fa0f034c8 100644
---
a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/MimirInfuser.java
+++
b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/MimirInfuser.java
@@ -43,6 +43,13 @@ public static void infuse(Path userHome) throws IOException {
if (!Files.isRegularFile(userWideExtensions)) {
Files.createDirectories(userWideExtensions.getParent());
Files.copy(realUserWideExtensions, userWideExtensions,
StandardCopyOption.REPLACE_EXISTING);
+
+ Path mimirProperties =
userHome.resolve(".mimir").resolve("mimir.properties");
+ Files.createDirectories(mimirProperties.getParent());
+ Files.copy(
+ Path.of("target/test-classes/ut-mimir.properties"),
+ mimirProperties,
+ StandardCopyOption.REPLACE_EXISTING);
}
}
}
diff --git
a/impl/maven-executor/src/test/resources-filtered/ut-mimir.properties
b/impl/maven-cli/src/test/resources-filtered/ut-mimir.properties
similarity index 69%
copy from impl/maven-executor/src/test/resources-filtered/ut-mimir.properties
copy to impl/maven-cli/src/test/resources-filtered/ut-mimir.properties
index 984901513b..e502ef6482 100644
--- a/impl/maven-executor/src/test/resources-filtered/ut-mimir.properties
+++ b/impl/maven-cli/src/test/resources-filtered/ut-mimir.properties
@@ -1,7 +1,7 @@
# Used IF outer build uses Mimir (CI setup)
# we change user.home in IT, so we want this interpolated
-mimir.daemon.socketPath=${user.home}/.mimir/mimir-socket
+mimir.daemon.basedir=${user.home}/.mimir
# outer build already did this
mimir.daemon.autoupdate=false
# outer build already did this
diff --git
a/impl/maven-executor/src/test/java/org/apache/maven/cling/executor/MimirInfuser.java
b/impl/maven-executor/src/test/java/org/apache/maven/cling/executor/MimirInfuser.java
index 1918296862..4cf53bf0c2 100644
---
a/impl/maven-executor/src/test/java/org/apache/maven/cling/executor/MimirInfuser.java
+++
b/impl/maven-executor/src/test/java/org/apache/maven/cling/executor/MimirInfuser.java
@@ -26,7 +26,7 @@
import static java.util.Objects.requireNonNull;
/**
- * Class that sets up Mimir for maven-cli tests IF outer build uses Mimir as
well (CI setup).
+ * Class that sets up Mimir for maven-executor tests IF outer build uses Mimir
as well (CI setup).
*/
public final class MimirInfuser {
public static void infuse(Path userHome) throws IOException {
diff --git
a/impl/maven-executor/src/test/resources-filtered/ut-mimir.properties
b/impl/maven-executor/src/test/resources-filtered/ut-mimir.properties
index 984901513b..74c68a3a18 100644
--- a/impl/maven-executor/src/test/resources-filtered/ut-mimir.properties
+++ b/impl/maven-executor/src/test/resources-filtered/ut-mimir.properties
@@ -1,8 +1,8 @@
# Used IF outer build uses Mimir (CI setup)
# we change user.home in IT, so we want this interpolated
-mimir.daemon.socketPath=${user.home}/.mimir/mimir-socket
+mimir.daemon.basedir=${user.home}/.mimir
# outer build already did this
mimir.daemon.autoupdate=false
# outer build already did this
-mimir.daemon.autostart=false
\ No newline at end of file
+mimir.daemon.autostart=false
diff --git a/its/core-it-suite/src/test/resources-filtered/it-mimir.properties
b/its/core-it-suite/src/test/resources-filtered/it-mimir.properties
index 101cf00afa..3cb4b7f0d2 100644
--- a/its/core-it-suite/src/test/resources-filtered/it-mimir.properties
+++ b/its/core-it-suite/src/test/resources-filtered/it-mimir.properties
@@ -1,7 +1,7 @@
# Used when profile "mimir" is activated
# we change user.home in IT, so we want this interpolated
-mimir.daemon.socketPath=${user.home}/.mimir/mimir-socket
+mimir.daemon.basedir=${user.home}/.mimir
# outer build already did this
mimir.daemon.autoupdate=false
# outer build already did this
