Skip to content

Align Toolbox versions #2096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 9, 2025
Merged

Align Toolbox versions #2096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/MavenInvokerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion impl/maven-executor/src/main/java/org/apache/maven/cling/executor/internal/ToolboxTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...aven-executor/src/test/java/org/apache/maven/cling/executor/MavenExecutorTestSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Expand All @@ -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()));
Expand Down
2 changes: 1 addition & 1 deletion ...core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8400CanonicalMavenHomeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down