Skip to content

Commit e885d05

Browse files
authored
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
1 parent 31129ee commit e885d05

File tree

7 files changed

+26
-5
lines changed

7 files changed

+26
-5
lines changed

.github/ci-extensions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ under the License.
2121
<extension>
2222
<groupId>eu.maveniverse.maven.mimir</groupId>
2323
<artifactId>extension</artifactId>
24-
<version>0.5.0</version>
24+
<version>0.7.8</version>
2525
</extension>
2626
</extensions>

impl/maven-cli/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,12 @@ under the License.
234234
</dependencies>
235235

236236
<build>
237+
<testResources>
238+
<testResource>
239+
<filtering>true</filtering>
240+
<directory>src/test/resources-filtered</directory>
241+
</testResource>
242+
</testResources>
237243
<plugins>
238244
<plugin>
239245
<groupId>org.apache.maven.plugins</groupId>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,13 @@ public static void infuse(Path userHome) throws IOException {
4343
if (!Files.isRegularFile(userWideExtensions)) {
4444
Files.createDirectories(userWideExtensions.getParent());
4545
Files.copy(realUserWideExtensions, userWideExtensions, StandardCopyOption.REPLACE_EXISTING);
46+
47+
Path mimirProperties = userHome.resolve(".mimir").resolve("mimir.properties");
48+
Files.createDirectories(mimirProperties.getParent());
49+
Files.copy(
50+
Path.of("target/test-classes/ut-mimir.properties"),
51+
mimirProperties,
52+
StandardCopyOption.REPLACE_EXISTING);
4653
}
4754
}
4855
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Used IF outer build uses Mimir (CI setup)
2+
3+
# we change user.home in IT, so we want this interpolated
4+
mimir.daemon.basedir=${user.home}/.mimir
5+
# outer build already did this
6+
mimir.daemon.autoupdate=false
7+
# outer build already did this
8+
mimir.daemon.autostart=false

impl/maven-executor/src/test/java/org/apache/maven/cling/executor/MimirInfuser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import static java.util.Objects.requireNonNull;
2727

2828
/**
29-
* Class that sets up Mimir for maven-cli tests IF outer build uses Mimir as well (CI setup).
29+
* Class that sets up Mimir for maven-executor tests IF outer build uses Mimir as well (CI setup).
3030
*/
3131
public final class MimirInfuser {
3232
public static void infuse(Path userHome) throws IOException {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Used IF outer build uses Mimir (CI setup)
22

33
# we change user.home in IT, so we want this interpolated
4-
mimir.daemon.socketPath=${user.home}/.mimir/mimir-socket
4+
mimir.daemon.basedir=${user.home}/.mimir
55
# outer build already did this
66
mimir.daemon.autoupdate=false
77
# outer build already did this
8-
mimir.daemon.autostart=false
8+
mimir.daemon.autostart=false

its/core-it-suite/src/test/resources-filtered/it-mimir.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Used when profile "mimir" is activated
22

33
# we change user.home in IT, so we want this interpolated
4-
mimir.daemon.socketPath=${user.home}/.mimir/mimir-socket
4+
mimir.daemon.basedir=${user.home}/.mimir
55
# outer build already did this
66
mimir.daemon.autoupdate=false
77
# outer build already did this

0 commit comments

Comments
 (0)