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 af765cc69f Just align Toolbox versions (#2096)
af765cc69f is described below
commit af765cc69feb336193a02bead29fdc8b75037cd2
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Sun Feb 9 19:56:12 2025 +0000
Just align Toolbox versions (#2096)
As they are used in various tests and prod code.
No issue, as these are tests or test used (IT) code.
---
.../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 +-
4 files changed, 6 insertions(+), 6 deletions(-)
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 73097f8814..9bc896c030 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
@@ -155,10 +155,10 @@ void conflictingSettings(
Map<String, String> logs = invoke(
cwd,
userHome,
- List.of("eu.maveniverse.maven.plugins:toolbox:0.6.1:help"),
+ List.of("eu.maveniverse.maven.plugins:toolbox:0.6.2:help"),
List.of("--force-interactive"));
- String log =
logs.get("eu.maveniverse.maven.plugins:toolbox:0.6.1:help");
+ String log =
logs.get("eu.maveniverse.maven.plugins:toolbox:0.6.2: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 af9ff88b56..b23a4948a3 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.5.2:";
+ private static final String TOOLBOX =
"eu.maveniverse.maven.plugins:toolbox:0.6.2:";
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 c129782851..c12b2f336f 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.5.2:gav-dump")
+
.argument("eu.maveniverse.maven.plugins:toolbox:0.6.2: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.5.2:gav-dump")
+
.argument("eu.maveniverse.maven.plugins:toolbox:0.6.2: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 836712f2d0..e4ed30946a 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
@@ -56,7 +56,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.5.2:gav-dump");
+
verifier.addCliArgument("eu.maveniverse.maven.plugins:toolbox:0.6.2:gav-dump");
verifier.execute();
verifier.verifyErrorFreeLog();
