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 1c01fa0284 Update Maveniverse stuff (#2269) 1c01fa0284 is described below commit 1c01fa0284afe819aa935f4d6bc5e81c8f878fd2 Author: Tamas Cservenak <ta...@cservenak.net> AuthorDate: Tue Apr 22 15:16:11 2025 +0200 Update Maveniverse stuff (#2269) Changes: * mimir 0.5.0 * bom-builder 1.0.4 * toolbox 0.7.4 --- .github/ci-extensions.xml | 2 +- apache-maven/pom.xml | 2 +- .../java/org/apache/maven/cling/invoker/mvn/MavenInvokerTest.java | 4 ++-- .../java/org/apache/maven/cling/executor/internal/ToolboxTool.java | 2 +- .../org/apache/maven/cling/executor/MavenExecutorTestSupport.java | 4 ++-- .../org/apache/maven/it/MavenITmng8400CanonicalMavenHomeTest.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/ci-extensions.xml b/.github/ci-extensions.xml index 6fa2d3b6ac..9bf530f896 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.4.1</version> + <version>0.5.0</version> </extension> </extensions> \ No newline at end of file diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 1f80e1e91b..d0acee6246 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -235,7 +235,7 @@ under the License. <plugin> <groupId>eu.maveniverse.maven.plugins</groupId> <artifactId>bom-builder3</artifactId> - <version>1.0.3</version> + <version>1.0.4</version> <executions> <execution> <id>skinny-bom</id> diff --git a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/MavenInvokerTest.java b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/MavenInvokerTest.java index de8b4fdf7b..698d1c8532 100644 --- a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/MavenInvokerTest.java +++ b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/MavenInvokerTest.java @@ -218,10 +218,10 @@ void conflictingSettings( Map<String, String> logs = invoke( cwd, userHome, - List.of("eu.maveniverse.maven.plugins:toolbox:0.6.2:help"), + List.of("eu.maveniverse.maven.plugins:toolbox:0.7.4:help"), List.of("--force-interactive")); - String log = logs.get("eu.maveniverse.maven.plugins:toolbox:0.6.2:help"); + String log = logs.get("eu.maveniverse.maven.plugins:toolbox:0.7.4:help"); assertTrue(log.contains("https://repo1.maven.org/maven2"), log); assertFalse(log.contains("https://repo.maven.apache.org/maven2"), log); } diff --git a/impl/maven-executor/src/main/java/org/apache/maven/cling/executor/internal/ToolboxTool.java b/impl/maven-executor/src/main/java/org/apache/maven/cling/executor/internal/ToolboxTool.java index 2c08093ce6..4357ba0d53 100644 --- a/impl/maven-executor/src/main/java/org/apache/maven/cling/executor/internal/ToolboxTool.java +++ b/impl/maven-executor/src/main/java/org/apache/maven/cling/executor/internal/ToolboxTool.java @@ -40,7 +40,7 @@ * @see <a href="https://github.com/maveniverse/toolbox">Maveniverse Toolbox</a> */ public class ToolboxTool implements ExecutorTool { - private static final String TOOLBOX = "eu.maveniverse.maven.plugins:toolbox:0.6.2:"; + private static final String TOOLBOX = "eu.maveniverse.maven.plugins:toolbox:0.7.4:"; private final ExecutorHelper helper; diff --git a/impl/maven-executor/src/test/java/org/apache/maven/cling/executor/MavenExecutorTestSupport.java b/impl/maven-executor/src/test/java/org/apache/maven/cling/executor/MavenExecutorTestSupport.java index 4a831c5bf3..98a0d641d2 100644 --- a/impl/maven-executor/src/test/java/org/apache/maven/cling/executor/MavenExecutorTestSupport.java +++ b/impl/maven-executor/src/test/java/org/apache/maven/cling/executor/MavenExecutorTestSupport.java @@ -76,7 +76,7 @@ void dump3( List.of(mvn3ExecutorRequestBuilder() .cwd(cwd) .userHomeDirectory(userHome) - .argument("eu.maveniverse.maven.plugins:toolbox:0.6.2:gav-dump") + .argument("eu.maveniverse.maven.plugins:toolbox:0.7.4:gav-dump") .argument("-l") .argument(logfile) .build())); @@ -95,7 +95,7 @@ void dump4( List.of(mvn4ExecutorRequestBuilder() .cwd(cwd) .userHomeDirectory(userHome) - .argument("eu.maveniverse.maven.plugins:toolbox:0.6.2:gav-dump") + .argument("eu.maveniverse.maven.plugins:toolbox:0.7.4:gav-dump") .argument("-l") .argument(logfile) .build())); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8400CanonicalMavenHomeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8400CanonicalMavenHomeTest.java index cb12cfa509..bf4b79bf78 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8400CanonicalMavenHomeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8400CanonicalMavenHomeTest.java @@ -57,7 +57,7 @@ void testIt() throws Exception { Verifier verifier = newVerifier(basedir.toString(), null); verifier.addCliArgument("-DasProperties"); verifier.addCliArgument("-DtoFile=dump.properties"); - verifier.addCliArgument("eu.maveniverse.maven.plugins:toolbox:0.6.2:gav-dump"); + verifier.addCliArgument("eu.maveniverse.maven.plugins:toolbox:0.7.4:gav-dump"); verifier.execute(); verifier.verifyErrorFreeLog();